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@

1 files changed, 2 insertions, 1 deletions

diff --git a/src/lib/libssl/ssl/Makefile b/src/lib/libssl/ssl/Makefile
index 74e3baa94a..15b761c9a8 100644
--- a/src/lib/libssl/ssl/Makefile
+++ b/src/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