Module Name: src
Committed By: elric
Date: Mon Feb 20 08:40:46 UTC 2012
Modified Files:
src/libexec/httpd: ssl-bozo.c
Log Message:
Use a ``certificate chain file'' rather than a ``certificate file'' so
that bozohttpd can be used with non-toplevel certs.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/libexec/httpd/ssl-bozo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/httpd/ssl-bozo.c
diff -u src/libexec/httpd/ssl-bozo.c:1.13 src/libexec/httpd/ssl-bozo.c:1.14
--- src/libexec/httpd/ssl-bozo.c:1.13 Fri Nov 18 09:51:31 2011
+++ src/libexec/httpd/ssl-bozo.c Mon Feb 20 08:40:46 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ssl-bozo.c,v 1.13 2011/11/18 09:51:31 mrg Exp $ */
+/* $NetBSD: ssl-bozo.c,v 1.14 2012/02/20 08:40:46 elric Exp $ */
/* $eterna: ssl-bozo.c,v 1.15 2011/11/18 09:21:15 mrg Exp $ */
@@ -176,8 +176,8 @@ bozo_ssl_init(bozohttpd_t *httpd)
bozo_ssl_err(httpd, EXIT_FAILURE,
"SSL context creation failed");
- if (1 != SSL_CTX_use_certificate_file(sslinfo->ssl_context,
- sslinfo->certificate_file, SSL_FILETYPE_PEM))
+ if (1 != SSL_CTX_use_certificate_chain_file(sslinfo->ssl_context,
+ sslinfo->certificate_file))
bozo_ssl_err(httpd, EXIT_FAILURE,
"Unable to use certificate file '%s'",
sslinfo->certificate_file);
