diff options
| author |   sthen <sthen@openbsd.org> | 2012-07-11 11:02:48 +0000 |
|---|---|---|
| committer | sthen <sthen@openbsd.org> | 2012-07-11 11:02:48 +0000 |
| commit | 4e5e78f35b4bf1b4d5f535ce0033256983675f41 (patch) | |
| tree | 9ae8dabf73b4aeff2b6b2268e643233326508599 /lib/libssl/src | |
| parent | for now, restrict hibernate to root in the acpi ioctl kernel interface. (diff) | |
| download | wireguard-openbsd-4e5e78f35b4bf1b4d5f535ce0033256983675f41.tar.xz wireguard-openbsd-4e5e78f35b4bf1b4d5f535ce0033256983675f41.zip | |
Disable SSLv2 in OpenSSL. No objections from djm.
Brad, jasper and naddy helped with test builds, fixing ports, etc.
Diffstat (limited to 'lib/libssl/src')
| -rw-r--r-- | lib/libssl/src/Makefile | 4 | ||||
| -rw-r--r-- | lib/libssl/src/apps/s_client.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/libssl/src/Makefile b/lib/libssl/src/Makefile index 8fe888587e8..aef28bea2ca 100644 --- a/lib/libssl/src/Makefile +++ b/lib/libssl/src/Makefile @@ -13,7 +13,7 @@ SHLIB_MAJOR=1 SHLIB_MINOR=0.0 SHLIB_EXT= PLATFORM=dist -OPTIONS= no-gmp no-jpake no-krb5 no-md2 no-rc5 no-rfc3779 no-shared no-store no-zlib no-zlib-dynamic static-engine +OPTIONS= no-gmp no-jpake no-krb5 no-md2 no-rc5 no-rfc3779 no-shared no-ssl2 no-store no-zlib no-zlib-dynamic static-engine CONFIGURE_ARGS=dist SHLIB_TARGET= @@ -61,7 +61,7 @@ OPENSSLDIR=/usr/local/ssl CC= cc CFLAG= -O -DEPFLAG= -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_STORE +DEPFLAG= -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_STORE -DOPENSSL_NO_SSL2 PEX_LIBS= EX_LIBS= EXE_EXT= diff --git a/lib/libssl/src/apps/s_client.c b/lib/libssl/src/apps/s_client.c index b0af5190d89..d9d060696f2 100644 --- a/lib/libssl/src/apps/s_client.c +++ b/lib/libssl/src/apps/s_client.c @@ -320,7 +320,9 @@ static void sc_usage(void) BIO_printf(bio_err," -jpake arg - JPAKE secret to use\n"); # endif #endif +#ifndef OPENSSL_NO_SSL2 BIO_printf(bio_err," -ssl2 - just use SSLv2\n"); +#endif BIO_printf(bio_err," -ssl3 - just use SSLv3\n"); BIO_printf(bio_err," -tls1 - just use TLSv1\n"); BIO_printf(bio_err," -dtls1 - just use DTLSv1\n"); |