From 7cb16bf14a2edab57faf5a6c166c77525ba57ab2 Mon Sep 17 00:00:00 2001 From: djm <> Date: Sat, 13 Oct 2012 21:31:56 +0000 Subject: Makefile and header changes for OpenSSL-1.0.1c major cranks --- src/lib/libssl/ssl/Makefile | 11 +++++------ src/lib/libssl/ssl/shlib_version | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'src/lib/libssl/ssl') diff --git a/src/lib/libssl/ssl/Makefile b/src/lib/libssl/ssl/Makefile index 0b8e5dfd53..74e3baa94a 100644 --- a/src/lib/libssl/ssl/Makefile +++ b/src/lib/libssl/ssl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2012/08/02 13:38:39 okan Exp $ +# $OpenBSD: Makefile,v 1.26 2012/10/13 21:31:56 djm Exp $ LIB= ssl @@ -6,8 +6,7 @@ SSLEAYDIST= src LSSL_SRC= ${.CURDIR}/../${SSLEAYDIST}/ssl -CFLAGS+= -DOPENSSL_NO_IDEA -DTERMIOS -DANSI_SOURCE -CFLAGS+= -DOPENSSL_NO_MDC2 +CFLAGS+= -DTERMIOS -DANSI_SOURCE CFLAGS+= -DOPENSSL_NO_RC5 -DOPENSSL_NO_KRB5 CFLAGS+= -DOPENSSL_NO_SSL2 CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST} -I${.CURDIR}/../${SSLEAYDIST}/crypto @@ -18,13 +17,13 @@ SRCS=\ s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c s23_pkt.c \ t1_meth.c t1_srvr.c t1_clnt.c t1_lib.c t1_enc.c \ d1_meth.c d1_srvr.c d1_clnt.c d1_lib.c d1_pkt.c \ - d1_both.c d1_enc.c \ + d1_both.c d1_enc.c d1_srtp.c \ ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c \ ssl_ciph.c ssl_stat.c ssl_rsa.c \ ssl_asn1.c ssl_txt.c ssl_algs.c \ - bio_ssl.c ssl_err.c kssl.c t1_reneg.c + bio_ssl.c ssl_err.c kssl.c tls_srp.c t1_reneg.c -HDRS= ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h kssl.h +HDRS= srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h kssl.h .PATH: ${LSSL_SRC} diff --git a/src/lib/libssl/ssl/shlib_version b/src/lib/libssl/ssl/shlib_version index 94727e17b3..0aab0406bf 100644 --- a/src/lib/libssl/ssl/shlib_version +++ b/src/lib/libssl/ssl/shlib_version @@ -1,2 +1,2 @@ -major=18 +major=19 minor=0 -- cgit v1.2.3-55-g6feb