19385782 Upgrade OpenSSL version to 1.0.1i s11-update
authorMisaki Miyashita <Misaki.Miyashita@Oracle.COM>
Wed, 13 Aug 2014 07:40:46 -0700
branchs11-update
changeset 3263 8766b70c7f00
parent 3261 310938d95566
child 3264 41c0b8d53f7b
19385782 Upgrade OpenSSL version to 1.0.1i 19385643 problem in LIBRARY/OPENSSL 19385653 problem in LIBRARY/OPENSSL 19385660 problem in LIBRARY/OPENSSL 19385675 problem in LIBRARY/OPENSSL 19385678 problem in LIBRARY/OPENSSL 19385688 problem in LIBRARY/OPENSSL 19385699 problem in LIBRARY/OPENSSL 19385708 problem in LIBRARY/OPENSSL 19385718 problem in LIBRARY/OPENSSL
components/openssl/openssl-1.0.1-fips-140/Makefile
components/openssl/openssl-1.0.1-fips-140/openssl-1.0.1-fips-140.p5m
components/openssl/openssl-1.0.1/Makefile
components/openssl/openssl-1.0.1/openssl-1.0.1.p5m
components/openssl/openssl-1.0.1/patches/30_wanboot.patch
--- a/components/openssl/openssl-1.0.1-fips-140/Makefile	Tue Aug 12 13:30:14 2014 -0700
+++ b/components/openssl/openssl-1.0.1-fips-140/Makefile	Wed Aug 13 07:40:46 2014 -0700
@@ -29,14 +29,14 @@
 COMPONENT_NAME =	openssl-fips-140
 # Note that this is the OpenSSL version that is used to build FIPS-140 certified
 # libraries. However, we use the FIPS canister version for the IPS package.
-COMPONENT_VERSION =	1.0.1h
+COMPONENT_VERSION =	1.0.1i
 IPS_COMPONENT_VERSION = 2.0.6
 COMPONENT_PROJECT_URL=	http://www.openssl.org/
 COMPONENT_SRC_NAME =	openssl
 COMPONENT_SRC =		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE =	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:9d1c8a9836aa63e2c6adb684186cbd4371c9e9dcc01d6e3bb447abf2d4d3d093
+    sha256:3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7
 COMPONENT_ARCHIVE_URL =	$(COMPONENT_PROJECT_URL)source/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/openssl
 
--- a/components/openssl/openssl-1.0.1-fips-140/openssl-1.0.1-fips-140.p5m	Tue Aug 12 13:30:14 2014 -0700
+++ b/components/openssl/openssl-1.0.1-fips-140/openssl-1.0.1-fips-140.p5m	Wed Aug 13 07:40:46 2014 -0700
@@ -34,7 +34,7 @@
 set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=com.oracle.info.description \
     value="the FIPS 140-2 Capable OpenSSL libraries"
-set name=com.oracle.info.tpno value=17979
+set name=com.oracle.info.tpno value=18553
 set name=info.classification value=org.opensolaris.category.2008:System/Security
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/openssl/openssl-1.0.1/Makefile	Tue Aug 12 13:30:14 2014 -0700
+++ b/components/openssl/openssl-1.0.1/Makefile	Wed Aug 13 07:40:46 2014 -0700
@@ -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.1h
+COMPONENT_VERSION =	1.0.1i
 # 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.1.8
+IPS_COMPONENT_VERSION = 1.0.1.9
 COMPONENT_PROJECT_URL=	http://www.openssl.org/
 COMPONENT_SRC =		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE =	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:9d1c8a9836aa63e2c6adb684186cbd4371c9e9dcc01d6e3bb447abf2d4d3d093
+    sha256:3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7
 
 COMPONENT_ARCHIVE_URL =	$(COMPONENT_PROJECT_URL)source/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/openssl
--- a/components/openssl/openssl-1.0.1/openssl-1.0.1.p5m	Tue Aug 12 13:30:14 2014 -0700
+++ b/components/openssl/openssl-1.0.1/openssl-1.0.1.p5m	Wed Aug 13 07:40:46 2014 -0700
@@ -30,7 +30,7 @@
     value="OpenSSL is a full-featured toolkit implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) protocols as well as a full-strength general purpose cryptography library."
 set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=com.oracle.info.description value=OpenSSL
-set name=com.oracle.info.tpno value=17979
+set name=com.oracle.info.tpno value=18553
 set name=info.classification value=org.opensolaris.category.2008:System/Security
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/openssl/openssl-1.0.1/patches/30_wanboot.patch	Tue Aug 12 13:30:14 2014 -0700
+++ b/components/openssl/openssl-1.0.1/patches/30_wanboot.patch	Wed Aug 13 07:40:46 2014 -0700
@@ -237,6 +237,20 @@
  
  #include <errno.h>
  #include <stdio.h>
[email protected]@ -179,6 +181,7 @@
+ 	return(ret);
+ 	}
+ 
++#ifndef        _BOOT
+ int RAND_write_file(const char *file)
+ 	{
+ 	unsigned char buf[BUFSIZE];
[email protected]@ -327,3 +330,5 @@
+ #endif
+ 	return(buf);
+ 	}
++
++#endif /* _BOOT */
 --- openssl-1.0.0e/crypto/x509v3/v3_utl.c	2009-07-27 14:08:53.000000000 -0700
 +++ openssl-1.0.0e_patched/crypto/x509v3/v3_utl.c	2011-12-13 05:10:08.844191400 -0800
 @@ -659,9 +659,52 @@