summaryrefslogtreecommitdiff
path: root/lib/libssl/ssl
diff options
context:
space:
mode:
authorStuart Henderson <sthen@cvs.openbsd.org>2012-07-11 11:02:49 +0000
committerStuart Henderson <sthen@cvs.openbsd.org>2012-07-11 11:02:49 +0000
commit827c2f9cfa50192dcf40fbcdf809d4a177e593b0 (patch)
treef135f23e099eeab58c9e5cbca1731d9d192da1bc /lib/libssl/ssl
parent4adda1767a38d51cee4c16eacea7488202647f36 (diff)
Disable SSLv2 in OpenSSL. No objections from djm.
Brad, jasper and naddy helped with test builds, fixing ports, etc.
Diffstat (limited to 'lib/libssl/ssl')
-rw-r--r--lib/libssl/ssl/Makefile3
-rw-r--r--lib/libssl/ssl/shlib_version4
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/libssl/ssl/Makefile b/lib/libssl/ssl/Makefile
index 8926ce54239..3215b33574c 100644
--- a/lib/libssl/ssl/Makefile
+++ b/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/lib/libssl/ssl/shlib_version b/lib/libssl/ssl/shlib_version
index 730231c38d0..94727e17b3a 100644
--- a/lib/libssl/ssl/shlib_version
+++ b/lib/libssl/ssl/shlib_version
@@ -1,2 +1,2 @@
-major=17
-minor=1
+major=18
+minor=0