# HG changeset patch
# User Ronald Jordan <ron.jordan@oracle.com>
# Date 1485975414 28800
# Node ID aba3229536ba179246ea6b5259fbfbf212df7406
# Parent  14258bbf3ff97f8a88dd3d0060ee4923df29238f
25455837 Upgrade OpenSSL version to 1.0.2k
25078626 problem in LIBRARY/OPENSSL
25455809 problem in LIBRARY/OPENSSL
25455821 problem in LIBRARY/OPENSSL

diff -r 14258bbf3ff9 -r aba3229536ba components/openssl/openssl-default/Makefile
--- a/components/openssl/openssl-default/Makefile	Wed Jan 25 01:12:51 2017 -0800
+++ b/components/openssl/openssl-default/Makefile	Wed Feb 01 10:56:54 2017 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
@@ -30,19 +30,19 @@
 # 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.2j
+COMPONENT_VERSION =	1.0.2k
 # 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.2.10
+IPS_COMPONENT_VERSION = 1.0.2.11
 COMPONENT_PROJECT_URL=	http://www.openssl.org/
 COMPONENT_SRC =		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE =	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431
+    sha256:6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0
 COMPONENT_ARCHIVE_URL =	$(COMPONENT_PROJECT_URL)source/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	library/openssl
 
-TPNO=			31866
+TPNO=			33605
 
 # Clone the patch files to the patches-all dir.
 # COPY_COMMON_FILES is there so that rsync is called as soon as
diff -r 14258bbf3ff9 -r aba3229536ba components/openssl/openssl-fips-140/Makefile
--- a/components/openssl/openssl-fips-140/Makefile	Wed Jan 25 01:12:51 2017 -0800
+++ b/components/openssl/openssl-fips-140/Makefile	Wed Feb 01 10:56:54 2017 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../../make-rules/shared-macros.mk
@@ -35,18 +35,18 @@
 # is the FIPS module version. The COMPONENT_VERSION changes with the core
 # OpenSSL version, but the IPS_COMPONENT_VERSION is purposely only to change if
 # the FIPS module version changes.
-COMPONENT_VERSION =	1.0.2j
+COMPONENT_VERSION =	1.0.2k
 IPS_COMPONENT_VERSION = 2.0.12
 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:e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431
+    sha256:6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0
 COMPONENT_ARCHIVE_URL =	$(COMPONENT_PROJECT_URL)source/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	library/openssl
 
-TPNO=			31866
+TPNO=			33605
 
 # Clone the patch files to the patches-all dir.
 # COPY_COMMON_FILES is there so that rsync is called as soon as