summaryrefslogtreecommitdiff
path: root/lib/libssl/ssl
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2013-02-14 15:11:45 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2013-02-14 15:11:45 +0000
commit1491d4f7e17ce15628fb1e48e09db5b15f98a2c0 (patch)
treea2b64fe859e99ea0552bc6d30a0f161b99714265 /lib/libssl/ssl
parentb738f0c89f818c393e10cb6575a2bc4d4879b720 (diff)
cherry pick bugfixes for http://www.openssl.org/news/secadv_20130205.txt
from the openssl git (changes between openssl 1.0.1c and 1.0.1d). ok djm@
Diffstat (limited to 'lib/libssl/ssl')
-rw-r--r--lib/libssl/ssl/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libssl/ssl/Makefile b/lib/libssl/ssl/Makefile
index 74e3baa94ab..15b761c9a8b 100644
--- a/lib/libssl/ssl/Makefile
+++ b/lib/libssl/ssl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2012/10/13 21:31:56 djm Exp $
+# $OpenBSD: Makefile,v 1.27 2013/02/14 15:11:44 markus Exp $
LIB= ssl
@@ -22,6 +22,7 @@ SRCS=\
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 tls_srp.c t1_reneg.c
+SRCS+= s3_cbc.c
HDRS= srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h kssl.h