Disable SSLv2 in OpenSSL. No objections from djm.

Brad, jasper and naddy helped with test builds, fixing ports, etc.

2 files changed, 4 insertions, 3 deletions

diff --git a/src/lib/libssl/ssl/Makefile b/src/lib/libssl/ssl/Makefile
index 8926ce5423..3215b33574 100644
--- a/src/lib/libssl/ssl/Makefile
+++ b/src/lib/libssl/ssl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2010/10/01 23:02:02 djm Exp $
+# $OpenBSD: Makefile,v 1.24 2012/07/11 11:02:48 sthen Exp $
 
 LIB=    ssl
 WANTLINT=
@@ -10,6 +10,7 @@ LSSL_SRC= ${.CURDIR}/../${SSLEAYDIST}/ssl
 CFLAGS+= -DOPENSSL_NO_IDEA -DTERMIOS -DANSI_SOURCE
 CFLAGS+= -DOPENSSL_NO_MDC2
 CFLAGS+= -DOPENSSL_NO_RC5 -DOPENSSL_NO_KRB5
+CFLAGS+= -DOPENSSL_NO_SSL2
 CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST} -I${.CURDIR}/../${SSLEAYDIST}/crypto
 
 SRCS=\
diff --git a/src/lib/libssl/ssl/shlib_version b/src/lib/libssl/ssl/shlib_version
index 730231c38d..94727e17b3 100644
--- a/src/lib/libssl/ssl/shlib_version
+++ b/src/lib/libssl/ssl/shlib_version
@@ -1,2 +1,2 @@
-major=17
-minor=1
+major=18
+minor=0