18308190 problem in UTILITY/OPENSSL s11u1-sru
authorRonald Jordan <ron.jordan@oracle.com>
Fri, 09 May 2014 08:45:21 -0700
branchs11u1-sru
changeset 3133 96f724c369da
parent 3122 e097b72fedb3
child 3134 8c9dcb670552
18308190 problem in UTILITY/OPENSSL 18694997 Upgrade OpenSSL to 1.0.0l
components/openssl/openssl-1.0.0/Makefile
components/openssl/openssl-1.0.0/patches/31_dtls_version-1.0.0.patch
--- a/components/openssl/openssl-1.0.0/Makefile	Wed May 07 00:33:26 2014 -0700
+++ b/components/openssl/openssl-1.0.0/Makefile	Fri May 09 08:45:21 2014 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
@@ -28,15 +28,15 @@
 # When upgrading OpenSSL, please, DON'T FORGET TO TEST WANBOOT too. 
 # For more information about wanboot-openssl testing, please refer to
 # ../README.
-COMPONENT_VERSION =	1.0.0k
+COMPONENT_VERSION =	1.0.0l
 # Version for IPS. It is easier to do it manually than convert the letter to a
 # number while taking into account that there might be no letter at all.
-IPS_COMPONENT_VERSION = 1.0.0.11
+IPS_COMPONENT_VERSION = 1.0.0.12
 COMPONENT_PROJECT_URL=	http://www.openssl.org/
 COMPONENT_SRC =		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE =	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:2982b2e9697a857b336c5c1b1b7b463747e5c1d560f25f6ace95365791b1efd1
+    sha256:2a072e67d9e3ae900548c43d7936305ba576025bd083d1e91ff14d68ded1fdec
 COMPONENT_ARCHIVE_URL =	$(COMPONENT_PROJECT_URL)source/$(COMPONENT_ARCHIVE)
 
 # Architecture-specific patches
@@ -314,7 +314,8 @@
     crypto/x509v3/v3_utl.o crypto/x509v3/v3err.o 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/ssl_rsa.o ssl/ssl_sess.o ssl/t1_enc.o ssl/t1_lib.o ssl/t1_reneg.o \
+    ssl/s3_cbc.o ssl/d1_enc.o
 
 # Linking of openssl bits for wanboot.
 # Interface for wanboot is specified in mapfile.wanboot. Object files are
--- a/components/openssl/openssl-1.0.0/patches/31_dtls_version-1.0.0.patch	Wed May 07 00:33:26 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
---- openssl-1.0.0k/ssl/s3_cbc.c.orig	2013-02-05 03:58:46.000000000 -0800
-+++ openssl-1.0.0k/ssl/s3_cbc.c	2013-02-27 17:25:37.618740089 -0800
[email protected]@ -137,7 +137,8 @@
- 			    unsigned mac_size)
- 	{
- 	unsigned padding_length, good, to_check, i;
--	const char has_explicit_iv = s->version == DTLS1_VERSION;
-+	const char has_explicit_iv =
-+	    (s->version == DTLS1_VERSION || s->version == DTLS1_BAD_VER);
- 	const unsigned overhead = 1 /* padding length byte */ +
- 				  mac_size +
- 				  (has_explicit_iv ? block_size : 0);