diff options
| author | Pierre-Yves Ritschard <pyr@cvs.openbsd.org> | 2007-09-28 13:05:29 +0000 |
|---|---|---|
| committer | Pierre-Yves Ritschard <pyr@cvs.openbsd.org> | 2007-09-28 13:05:29 +0000 |
| commit | 911272ae511552222450763864427a141e22a68f (patch) | |
| tree | df429f0d1328eb7a66f6ed4b9cf3d20932f2b20b /usr.sbin/relayd/relayd.h | |
| parent | bf9e17515a7b06299339f7e9715c2647b620688a (diff) | |
Change the ssl_privsep code to work on char buffers.
The fd based code introduced weirdness since all children were accessing
the same fd at once. This will also greatly facilitate reloading, no
fd-passing will be involved between the parent and relay children.
While there, cleanup the code diverting from the original ssl_rsa.c code
a bit more.
Weird behavior discovery by pascoe@.
Diffstat (limited to 'usr.sbin/relayd/relayd.h')
| -rw-r--r-- | usr.sbin/relayd/relayd.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/usr.sbin/relayd/relayd.h b/usr.sbin/relayd/relayd.h index 5456334f7cb..f261e2a63be 100644 --- a/usr.sbin/relayd/relayd.h +++ b/usr.sbin/relayd/relayd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: relayd.h,v 1.62 2007/09/27 13:34:21 pyr Exp $ */ +/* $OpenBSD: relayd.h,v 1.63 2007/09/28 13:05:28 pyr Exp $ */ /* * Copyright (c) 2006, 2007 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -524,8 +524,10 @@ struct relay_config { struct relay { TAILQ_ENTRY(relay) entry; - int cert_fd; - int key_fd; + char *ssl_cert; + off_t ssl_cert_len; + char *ssl_key; + off_t ssl_key_len; struct relay_config conf; int up; @@ -739,8 +741,8 @@ SSL_CTX *ssl_ctx_create(struct hoststated *); void ssl_error(const char *, const char *); /* ssl_privsep.c */ -int ssl_ctx_use_private_key(SSL_CTX *, int); -int ssl_ctx_use_certificate_chain(SSL_CTX *, int); +int ssl_ctx_use_private_key(SSL_CTX *, char *, off_t); +int ssl_ctx_use_certificate_chain(SSL_CTX *, char *, off_t); /* hoststated.c */ struct host *host_find(struct hoststated *, objid_t); |