summaryrefslogtreecommitdiffstats
path: root/usr.sbin/httpd/server.c
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2015-07-15 16:00:39 +0000
committerjsing <jsing@openbsd.org>2015-07-15 16:00:39 +0000
commit6f8bdc862b4eba8f72d51aae2c7b53ff1f510f55 (patch)
tree71221807b09baaa31ea27a5fdbf4d02fd0a46308 /usr.sbin/httpd/server.c
parenttypo in manual page. (diff)
downloadwireguard-openbsd-6f8bdc862b4eba8f72d51aae2c7b53ff1f510f55.tar.xz
wireguard-openbsd-6f8bdc862b4eba8f72d51aae2c7b53ff1f510f55.zip
Send the TLS certificate and key via separate imsgs, rather than
including them in the IMSG_CFG_SERVER imsg. This allows the certificate and key to each be almost 16KB (the maximum size for an imsg), rather than having a combined total of less than 16KB (which can be reached with large keys, certificate bundles or by including text versions of certificates). ok reyk@
Diffstat (limited to 'usr.sbin/httpd/server.c')
-rw-r--r--usr.sbin/httpd/server.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.sbin/httpd/server.c b/usr.sbin/httpd/server.c
index 15d19450a36..d28b67b90c6 100644
--- a/usr.sbin/httpd/server.c
+++ b/usr.sbin/httpd/server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.65 2015/07/15 14:49:42 jsing Exp $ */
+/* $OpenBSD: server.c,v 1.66 2015/07/15 16:00:39 jsing Exp $ */
/*
* Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org>
@@ -1134,6 +1134,9 @@ server_dispatch_parent(int fd, struct privsep_proc *p, struct imsg *imsg)
case IMSG_CFG_SERVER:
config_getserver(env, imsg);
break;
+ case IMSG_CFG_TLS:
+ config_gettls(env, imsg);
+ break;
case IMSG_CFG_DONE:
config_getcfg(env, imsg);
break;