summaryrefslogtreecommitdiffstats
path: root/usr.sbin/httpd/src/modules/ssl/mod_ssl.c
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2013-07-16 13:22:55 +0000
committerjsing <jsing@openbsd.org>2013-07-16 13:22:55 +0000
commit2d61c986d448ac93b616082f0bbbc4398bcba718 (patch)
treea0fb83e717fecd3ddbfeb6cc4ed5818c8680c72f /usr.sbin/httpd/src/modules/ssl/mod_ssl.c
parentEnable ECDHE support in httpd via a SSLECDHCurve option. This specifies the (diff)
downloadwireguard-openbsd-2d61c986d448ac93b616082f0bbbc4398bcba718.tar.xz
wireguard-openbsd-2d61c986d448ac93b616082f0bbbc4398bcba718.zip
Disable SSL compression in order to mitigate CRIME attacks. Add
an SSLCompression option so that it can be turned back on, however on this is currently a no-op due to the compile options for libssl. Requested by and ok djm@
Diffstat (limited to 'usr.sbin/httpd/src/modules/ssl/mod_ssl.c')
-rw-r--r--usr.sbin/httpd/src/modules/ssl/mod_ssl.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/usr.sbin/httpd/src/modules/ssl/mod_ssl.c b/usr.sbin/httpd/src/modules/ssl/mod_ssl.c
index 01133e25485..216700bab2f 100644
--- a/usr.sbin/httpd/src/modules/ssl/mod_ssl.c
+++ b/usr.sbin/httpd/src/modules/ssl/mod_ssl.c
@@ -74,7 +74,7 @@
* identify the module to SCCS `what' and RCS `ident' commands
*/
static char const sccsid[] = "@(#) mod_ssl/" MOD_SSL_VERSION " >";
-static char const rcsid[] = "$Id: mod_ssl.c,v 1.13 2013/07/16 13:02:16 jsing Exp $";
+static char const rcsid[] = "$Id: mod_ssl.c,v 1.14 2013/07/16 13:22:55 jsing Exp $";
/*
* the table of configuration directives we provide
@@ -107,15 +107,18 @@ static command_rec ssl_config_cmds[] = {
AP_SRV_CMD(Engine, FLAG,
"SSL switch for the protocol engine "
"(`on', `off')")
- AP_SRV_CMD(HonorCipherOrder, FLAG,
- "Let the server determine preferred ciphers "
- "(`on', `off')")
+ AP_SRV_CMD(Compression, FLAG,
+ "Use SSL compression "
+ "(`on', `off')")
AP_ALL_CMD(CipherSuite, TAKE1,
"Colon-delimited list of permitted SSL Ciphers "
"(`XXX:...:XXX' - see manual)")
AP_SRV_CMD(ECDHCurve, TAKE1,
"Name of ECDH curve to use for ephemeral EC keys "
"(`curve' - see manual)")
+ AP_SRV_CMD(HonorCipherOrder, FLAG,
+ "Let the server determine preferred ciphers "
+ "(`on', `off')")
AP_SRV_CMD(CertificateFile, TAKE1,
"SSL Server Certificate file "
"(`/path/to/file' - PEM or DER encoded)")