diff options
| author |   sthen <sthen@openbsd.org> | 2012-07-07 17:08:17 +0000 |
|---|---|---|
| committer | sthen <sthen@openbsd.org> | 2012-07-07 17:08:17 +0000 |
| commit | 9378b3a1f75258ebc86346983f2b953bc09b8f5d (patch) | |
| tree | 8c77b437716364df2152d919c85cd88bda786eaa | |
| parent | re-add correctly handling no arguments (diff) | |
| download | wireguard-openbsd-9378b3a1f75258ebc86346983f2b953bc09b8f5d.tar.xz wireguard-openbsd-9378b3a1f75258ebc86346983f2b953bc09b8f5d.zip | |
allow httpd to build if sslv2 is disabled, ok guenther@
| -rw-r--r-- | usr.sbin/httpd/src/modules/ssl/ssl_engine_init.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/usr.sbin/httpd/src/modules/ssl/ssl_engine_init.c b/usr.sbin/httpd/src/modules/ssl/ssl_engine_init.c index 0d6227a9528..61a9a5b3594 100644 --- a/usr.sbin/httpd/src/modules/ssl/ssl_engine_init.c +++ b/usr.sbin/httpd/src/modules/ssl/ssl_engine_init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_engine_init.c,v 1.27 2005/02/09 12:13:10 henning Exp $ */ +/* $OpenBSD: ssl_engine_init.c,v 1.28 2012/07/07 17:08:17 sthen Exp $ */ /* _ _ ** _ __ ___ ___ __| | ___ ___| | mod_ssl @@ -581,10 +581,7 @@ void ssl_init_ConfigureServer(server_rec *s, pool *p, SSLSrvConfigRec *sc) cp[strlen(cp)-2] = NUL; ssl_log(s, SSL_LOG_TRACE, "Init: (%s) Creating new SSL context (protocols: %s)", cpVHostID, cp); - if (sc->nProtocol == SSL_PROTOCOL_SSLV2) - ctx = SSL_CTX_new(SSLv2_server_method()); /* only SSLv2 is left */ - else - ctx = SSL_CTX_new(SSLv23_server_method()); /* be more flexible */ + ctx = SSL_CTX_new(SSLv23_server_method()); SSL_CTX_set_options(ctx, SSL_OP_ALL); if (!(sc->nProtocol & SSL_PROTOCOL_SSLV2)) SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2); |