16833903 problem in UTILITY/OPENSSL s11-update
authorWilliam Schumann <william.schumann@oracle.com>
Tue, 09 Jul 2013 12:02:39 +0200
branchs11-update
changeset 2671 d6ba685a7aac
parent 2670 eaef8ade1d5d
child 2673 826404624cf4
16833903 problem in UTILITY/OPENSSL
components/openssl/openssl-1.0.1/Makefile
components/openssl/openssl-1.0.1/mapfile.wanboot
--- a/components/openssl/openssl-1.0.1/Makefile	Mon Jul 08 15:13:23 2013 -0700
+++ b/components/openssl/openssl-1.0.1/Makefile	Tue Jul 09 12:02:39 2013 +0200
@@ -320,7 +320,7 @@
     ssl/s3_both.o ssl/s3_clnt.o ssl/s3_enc.o ssl/s3_lib.o ssl/s3_pkt.o \
     ssl/ssl_algs.o ssl/ssl_asn1.o ssl/ssl_cert.o ssl/ssl_ciph.o ssl/ssl_err.o \
     ssl/ssl_err2.o ssl/ssl_lib.o ssl/ssl_rsa.o ssl/ssl_sess.o ssl/t1_enc.o \
-    ssl/t1_lib.o ssl/t1_reneg.o ssl/d1_srtp.o ssl/s3_cbc.o
+    ssl/t1_lib.o ssl/t1_reneg.o ssl/d1_srtp.o ssl/s3_cbc.o ssl/t1_clnt.o
 
 # Linking of openssl bits for wanboot.
 # Interface for wanboot is specified in mapfile.wanboot. Object files are
--- a/components/openssl/openssl-1.0.1/mapfile.wanboot	Mon Jul 08 15:13:23 2013 -0700
+++ b/components/openssl/openssl-1.0.1/mapfile.wanboot	Tue Jul 09 12:02:39 2013 +0200
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -77,6 +77,7 @@
 		SSL_read;
 		SSL_new;
 		SSLv3_client_method;
+		TLSv1_2_client_method;
 		X509_check_private_key;
 		SSL_CTX_new;
 		ASN1_TYPE_set;