update to latest openssl

signalapp · Jun 1, 2018 · 4fa9dbe · 4fa9dbe
1 parent 86cbd78
commit 4fa9dbe
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git a/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework/Headers/asn1.h b/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework/Headers/asn1.h
@@ -1365,6 +1365,7 @@ void ERR_load_ASN1_strings(void);
 # define ASN1_R_MSTRING_NOT_UNIVERSAL                     139
 # define ASN1_R_MSTRING_WRONG_TAG                         140
 # define ASN1_R_NESTED_ASN1_STRING                        197
+# define ASN1_R_NESTED_TOO_DEEP                           219
 # define ASN1_R_NON_HEX_CHARACTERS                        141
 # define ASN1_R_NOT_ASCII_FORMAT                          190
 # define ASN1_R_NOT_ENOUGH_DATA                           142

diff --git a/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework/Headers/openssl.h b/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework/Headers/openssl.h
@@ -2,7 +2,7 @@
 //  openssl.h
 //  OpenSSL-iOS
 //
-//  Created by @levigroker Tue Jan 16 14:43:27 EST 2018.
+//  Created by @levigroker Wed May 30 19:27:21 EDT 2018.
 //  Copyright © 2018 @levigroker. All rights reserved.
 //
 

diff --git a/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework/Headers/opensslconf.h b/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework/Headers/opensslconf.h
@@ -122,8 +122,8 @@ extern "C" {
 
 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/tmp/openssl-1.0.2n-arm64/lib/engines"
-#define OPENSSLDIR "/tmp/openssl-1.0.2n-arm64"
+#define ENGINESDIR "/tmp/openssl-1.0.2o-arm64/lib/engines"
+#define OPENSSLDIR "/tmp/openssl-1.0.2o-arm64"
 #endif
 #endif
 

diff --git a/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework/Headers/opensslv.h b/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework/Headers/opensslv.h
@@ -30,11 +30,11 @@ extern "C" {
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-# define OPENSSL_VERSION_NUMBER  0x100020efL
+# define OPENSSL_VERSION_NUMBER  0x100020ffL
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2n-fips  7 Dec 2017"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2o-fips  27 Mar 2018"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2n  7 Dec 2017"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2o  27 Mar 2018"
 # endif
 # define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
 

diff --git a/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework/Info.plist b/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework/Info.plist
diff --git a/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework/openssl b/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework/openssl
diff --git a/Manifest.lock b/Manifest.lock
@@ -194,7 +194,7 @@ CHECKOUT OPTIONS:
     :commit: 03a19c80aafc10a3464f0c086b1eb38239c507ac
     :git: https://github.com/signalapp/Curve25519Kit
   GRKOpenSSLFramework:
-    :commit: 841e24eba93cabfe503222f858de2a40b3762aab
+    :commit: b799c27e7927e5304ec1e4ad53c6d33c6fd1cae7
     :git: https://github.com/signalapp/GRKOpenSSLFramework
   HKDFKit:
     :commit: d2e2e50990e88537d6c4e38cc32a6f6debd83446