--- a/components/openssl/openssl-1.0.1-fips-140/Makefile	Fri Dec 04 13:58:11 2015 -0800
+++ b/components/openssl/openssl-1.0.1-fips-140/Makefile	Tue Dec 15 10:28:02 2015 -0800
@@ -32,18 +32,18 @@
 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.1p
+COMPONENT_VERSION =	1.0.1q
 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:bd5ee6803165c0fb60bbecbacacf244f1f90d2aa0d71353af610c29121e9b2f1
+    sha256:b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7
 COMPONENT_ARCHIVE_URL =	$(COMPONENT_PROJECT_URL)source/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	library/openssl
 
-TPNO=			23452
+TPNO=			25901
 
 # OpenSSL FIPS directory
 OPENSSL_FIPS_DIR = $(COMPONENT_DIR)/../openssl-fips

--- a/components/openssl/openssl-1.0.1-fips-140/patches/39_test.patch	Fri Dec 04 13:58:11 2015 -0800
+++ b/components/openssl/openssl-1.0.1-fips-140/patches/39_test.patch	Tue Dec 15 10:28:02 2015 -0800
@@ -12,6 +12,7 @@
  	test_gen test_req test_pkcs7 test_verify test_dh test_dsa \
 -	test_ss test_ca test_engine test_evp test_evp_extra test_ssl test_tsa test_ige \
 +	test_ss test_engine test_evp test_evp_extra test_ssl test_tsa test_ige \
- 	test_jpake test_srp test_cms test_heartbeat test_constant_time test_verify_extra
+ 	test_jpake test_srp test_cms test_heartbeat test_constant_time test_verify_extra \
+ 	test_clienthello
  
  test_evp:

--- a/components/openssl/openssl-1.0.1/Makefile	Fri Dec 04 13:58:11 2015 -0800
+++ b/components/openssl/openssl-1.0.1/Makefile	Tue Dec 15 10:28:02 2015 -0800
@@ -28,20 +28,20 @@
 # 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.1p
+COMPONENT_VERSION =	1.0.1q
 # 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.16
+IPS_COMPONENT_VERSION = 1.0.1.17
 COMPONENT_PROJECT_URL=	http://www.openssl.org/
 COMPONENT_SRC =		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE =	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:bd5ee6803165c0fb60bbecbacacf244f1f90d2aa0d71353af610c29121e9b2f1
+    sha256:b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7
 
 COMPONENT_ARCHIVE_URL =	$(COMPONENT_PROJECT_URL)source/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	library/openssl
 
-TPNO=			23452
+TPNO=			25901
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk

--- a/components/openssl/openssl-1.0.1/patches/37_openssl_t4_inline.patch	Fri Dec 04 13:58:11 2015 -0800
+++ b/components/openssl/openssl-1.0.1/patches/37_openssl_t4_inline.patch	Tue Dec 15 10:28:02 2015 -0800
@@ -1261,9 +1261,9 @@
 +#endif
  #  ifdef EVP_CHECK_DES_KEY
 -    if (DES_set_key_checked(&deskey[0], &data(ctx)->ks1)
--        ! !DES_set_key_checked(&deskey[1], &data(ctx)->ks2))
+-        || DES_set_key_checked(&deskey[1], &data(ctx)->ks2))
 +    if (DES_set_key_checked(&deskey[0],&dat->ks1)
-+        !! DES_set_key_checked(&deskey[1],&dat->ks2))
++        || DES_set_key_checked(&deskey[1],&dat->ks2))
          return 0;
  #  else
 -    DES_set_key_unchecked(&deskey[0], &data(ctx)->ks1);

--- a/components/openssl/openssl-1.0.1/patches/39_internal_tests.patch	Fri Dec 04 13:58:11 2015 -0800
+++ b/components/openssl/openssl-1.0.1/patches/39_internal_tests.patch	Tue Dec 15 10:28:02 2015 -0800
@@ -12,6 +12,7 @@
  	test_gen test_req test_pkcs7 test_verify test_dh test_dsa \
 -	test_ss test_ca test_engine test_evp test_evp_extra test_ssl test_tsa test_ige \
 +	test_ss test_engine test_evp test_evp_extra test_ssl test_tsa test_ige \
- 	test_jpake test_srp test_cms test_heartbeat test_constant_time test_verify_extra
+ 	test_jpake test_srp test_cms test_heartbeat test_constant_time test_verify_extra \
+ 	test_clienthello
  
  test_evp: