Upgrading OpenSSL Pods to 1.0.2d.

FredericJacobs · Jul 13, 2015 · 5b36861 · 5b36861
1 parent 41c8315
commit 5b36861
Show file tree

Hide file tree

Showing 33 changed files with 4,335 additions and 4,335 deletions.
diff --git a/Manifest.lock b/Manifest.lock
@@ -41,7 +41,7 @@ PODS:
   - Mantle (2.0.2):
     - Mantle/extobjc (= 2.0.2)
   - Mantle/extobjc (2.0.2)
-  - OpenSSL (1.0.203)
+  - OpenSSL (1.0.204)
   - PastelogKit (1.2):
     - CocoaLumberjack (~> 1.9)
   - ProtocolBuffers (1.9.8)
@@ -70,7 +70,7 @@ DEPENDENCIES:
     commit `e5582fef8a6b3e35f8070361ef37237222da712b`)
   - libPhoneNumber-iOS (~> 0.8.5)
   - Mantle (~> 2.0.2)
-  - OpenSSL (~> 1.0.203)
+  - OpenSSL (~> 1.0.204)
   - PastelogKit (~> 1.2)
   - SCWaveformView (~> 1.0)
   - SocketRocket (from `https://github.com/FredericJacobs/SocketRocket.git`, commit
@@ -117,7 +117,7 @@ SPEC CHECKSUMS:
   JSQSystemSoundPlayer: c5850e77a4363ffd374cd851154b9af93264ed8d
   libPhoneNumber-iOS: b8ccd23576379caca37c7cbdd554addf384459ed
   Mantle: 967fd31ea0220890b2e76589198996b534bb3fb1
-  OpenSSL: 65f5de70414ee909cea517ded684d8ef855b02b4
+  OpenSSL: 576b352e6e6e60793ca133c6785736e3cbc31a09
   PastelogKit: c73795b8c0bbf33ea45d3b6a5eabb373be3d5955
   ProtocolBuffers: 9a4a171c0c7cc8f21dd29aeca4f9ac775d84a880
   SCWaveformView: 52a96750255d817e300565a80c81fb643e233e07

diff --git a/OpenSSL/README b/OpenSSL/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.0.2c 12 Jun 2015
+ OpenSSL 1.0.2d 9 Jul 2015
 
  Copyright (c) 1998-2011 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson

diff --git a/OpenSSL/lib/libcrypto.a b/OpenSSL/lib/libcrypto.a
diff --git a/OpenSSL/lib/libssl.a b/OpenSSL/lib/libssl.a
diff --git a/OpenSSL/opensslIncludes/openssl/bio.h b/OpenSSL/opensslIncludes/openssl/bio.h
@@ -291,7 +291,7 @@ void BIO_clear_flags(BIO *b, int flags);
  * BIO_CB_RETURN flag indicates if it is after the call
  */
 # define BIO_CB_RETURN   0x80
-# define BIO_CB_return(a) ((a)|BIO_CB_RETURN))
+# define BIO_CB_return(a) ((a)|BIO_CB_RETURN)
 # define BIO_cb_pre(a)   (!((a)&BIO_CB_RETURN))
 # define BIO_cb_post(a)  ((a)&BIO_CB_RETURN)
 

diff --git a/OpenSSL/opensslIncludes/openssl/opensslconf.h b/OpenSSL/opensslIncludes/openssl/opensslconf.h
@@ -107,8 +107,8 @@ extern "C" {
 
 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/tmp/openssl/bin/iPhoneOS8.3-arm64.sdk/lib/engines"
-#define OPENSSLDIR "/tmp/openssl/bin/iPhoneOS8.3-arm64.sdk"
+#define ENGINESDIR "/tmp/openssl/bin/iPhoneOS8.4-arm64.sdk/lib/engines"
+#define OPENSSLDIR "/tmp/openssl/bin/iPhoneOS8.4-arm64.sdk"
 #endif
 #endif
 
@@ -203,7 +203,7 @@ extern "C" {
 #endif
 
 #if defined(DES_RISC1) && defined(DES_RISC2)
-YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
+#error YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
 #endif
 
 /* Unroll the inner loop, this sometimes helps, sometimes hinders.

diff --git a/OpenSSL/opensslIncludes/openssl/opensslv.h b/OpenSSL/opensslIncludes/openssl/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  0x1000203fL
+# define OPENSSL_VERSION_NUMBER  0x1000204fL
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2c-fips 12 Jun 2015"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2d-fips 9 Jul 2015"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2c 12 Jun 2015"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2d 9 Jul 2015"
 # endif
 # define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
 

diff --git a/Pods.xcodeproj/project.pbxproj b/Pods.xcodeproj/project.pbxproj
diff --git a/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-25519.xcscheme b/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-25519.xcscheme
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "FD63CDDB91A223B80A1AD6FE"
+               BlueprintIdentifier = "07ADD70A44BC10358F157D95"
                BuildableName = "libPods-25519.a"
                BlueprintName = "Pods-25519"
                ReferencedContainer = "container:Pods.xcodeproj">

diff --git a/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-AFNetworking.xcscheme b/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-AFNetworking.xcscheme
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "147F989E60A758E83FEC71A3"
+               BlueprintIdentifier = "E553CF7D244556F1C92A73C5"
                BuildableName = "libPods-AFNetworking.a"
                BlueprintName = "Pods-AFNetworking"
                ReferencedContainer = "container:Pods.xcodeproj">

diff --git a/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-APDropDownNavToolbar.xcscheme b/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-APDropDownNavToolbar.xcscheme
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "7029F23F0FCC0B728E0D539D"
+               BlueprintIdentifier = "499BE0B31E865C4B5CB716A1"
                BuildableName = "libPods-APDropDownNavToolbar.a"
                BlueprintName = "Pods-APDropDownNavToolbar"
                ReferencedContainer = "container:Pods.xcodeproj">

diff --git a/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-AxolotlKit.xcscheme b/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-AxolotlKit.xcscheme
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "7584A6A244B69078D206B5FF"
+               BlueprintIdentifier = "14DD1D3CEA50460A6462B180"
                BuildableName = "libPods-AxolotlKit.a"
                BlueprintName = "Pods-AxolotlKit"
                ReferencedContainer = "container:Pods.xcodeproj">

diff --git a/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-CocoaLumberjack.xcscheme b/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-CocoaLumberjack.xcscheme
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B74A13250938C86631A7E77E"
+               BlueprintIdentifier = "B961C2E203A7D3BB78F22EC5"
                BuildableName = "libPods-CocoaLumberjack.a"
                BlueprintName = "Pods-CocoaLumberjack"
                ReferencedContainer = "container:Pods.xcodeproj">

diff --git a/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-DJWActionSheet.xcscheme b/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-DJWActionSheet.xcscheme
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D4D79B561F795042AC0C1107"
+               BlueprintIdentifier = "FB3B7EC74D8794679660642D"
                BuildableName = "libPods-DJWActionSheet.a"
                BlueprintName = "Pods-DJWActionSheet"
                ReferencedContainer = "container:Pods.xcodeproj">

diff --git a/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-FFCircularProgressView.xcscheme b/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-FFCircularProgressView.xcscheme
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "8CAAF2170BB44FFDF9F09C4B"
+               BlueprintIdentifier = "7888E47917A5B5F45D1BD123"
                BuildableName = "libPods-FFCircularProgressView.a"
                BlueprintName = "Pods-FFCircularProgressView"
                ReferencedContainer = "container:Pods.xcodeproj">

diff --git a/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-HKDFKit.xcscheme b/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-HKDFKit.xcscheme
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "EF5BD17B7A64797B4EB990BF"
+               BlueprintIdentifier = "E8C9380673C030E8934AC8DD"
                BuildableName = "libPods-HKDFKit.a"
                BlueprintName = "Pods-HKDFKit"
                ReferencedContainer = "container:Pods.xcodeproj">

diff --git a/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-JSQMessagesViewController.xcscheme b/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-JSQMessagesViewController.xcscheme
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4FDF6A2F2EB9E16E95F0D81A"
+               BlueprintIdentifier = "B4EFCBA6073AE2B302A432AD"
                BuildableName = "libPods-JSQMessagesViewController.a"
                BlueprintName = "Pods-JSQMessagesViewController"
                ReferencedContainer = "container:Pods.xcodeproj">

diff --git a/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-JSQSystemSoundPlayer.xcscheme b/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-JSQSystemSoundPlayer.xcscheme
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "85F90C2524FBE622F63D75DF"
+               BlueprintIdentifier = "F8903BBCA1E1F1BBA12C0F0A"
                BuildableName = "libPods-JSQSystemSoundPlayer.a"
                BlueprintName = "Pods-JSQSystemSoundPlayer"
                ReferencedContainer = "container:Pods.xcodeproj">

diff --git a/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-Mantle.xcscheme b/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-Mantle.xcscheme
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "9191C1268237D027F5AD7F2C"
+               BlueprintIdentifier = "C67265783BB02F491FA7147E"
                BuildableName = "libPods-Mantle.a"
                BlueprintName = "Pods-Mantle"
                ReferencedContainer = "container:Pods.xcodeproj">

diff --git a/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-PastelogKit.xcscheme b/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-PastelogKit.xcscheme
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "AD3D3E74B89AB1411F0DC686"
+               BlueprintIdentifier = "981249415997425FBE2C667C"
                BuildableName = "libPods-PastelogKit.a"
                BlueprintName = "Pods-PastelogKit"
                ReferencedContainer = "container:Pods.xcodeproj">

diff --git a/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-ProtocolBuffers.xcscheme b/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-ProtocolBuffers.xcscheme
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "EC23E220AEAD1C52CA083830"
+               BlueprintIdentifier = "50EC9A6931E2517978616071"
                BuildableName = "libPods-ProtocolBuffers.a"
                BlueprintName = "Pods-ProtocolBuffers"
                ReferencedContainer = "container:Pods.xcodeproj">

diff --git a/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-SCWaveformView.xcscheme b/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-SCWaveformView.xcscheme
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "335DCDE20B38448BCC27D295"
+               BlueprintIdentifier = "85AAE6551CD1500172837062"
                BuildableName = "libPods-SCWaveformView.a"
                BlueprintName = "Pods-SCWaveformView"
                ReferencedContainer = "container:Pods.xcodeproj">

diff --git a/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-SQLCipher.xcscheme b/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-SQLCipher.xcscheme
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "3C6D6C60AF9B7D9A0CC77D28"
+               BlueprintIdentifier = "3B5BD2D886A23052167139EC"
                BuildableName = "libPods-SQLCipher.a"
                BlueprintName = "Pods-SQLCipher"
                ReferencedContainer = "container:Pods.xcodeproj">

diff --git a/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-SSKeychain.xcscheme b/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-SSKeychain.xcscheme
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "81E9E44E02AEEFA0425B6B03"
+               BlueprintIdentifier = "D33504307D0967B1878585D5"
                BuildableName = "libPods-SSKeychain.a"
                BlueprintName = "Pods-SSKeychain"
                ReferencedContainer = "container:Pods.xcodeproj">

diff --git a/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-SocketRocket.xcscheme b/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-SocketRocket.xcscheme
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "FC1F047A689E1764713AF609"
+               BlueprintIdentifier = "8F91002AE1A00E7D87EA7AEE"
                BuildableName = "libPods-SocketRocket.a"
                BlueprintName = "Pods-SocketRocket"
                ReferencedContainer = "container:Pods.xcodeproj">

diff --git a/...xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-TwistedOakCollapsingFutures.xcscheme b/...xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-TwistedOakCollapsingFutures.xcscheme
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "771E7894AEED398E61A5A67C"
+               BlueprintIdentifier = "18BCACACA7484DCABE81D6E5"
                BuildableName = "libPods-TwistedOakCollapsingFutures.a"
                BlueprintName = "Pods-TwistedOakCollapsingFutures"
                ReferencedContainer = "container:Pods.xcodeproj">

diff --git a/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-UICKeyChainStore.xcscheme b/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-UICKeyChainStore.xcscheme
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "08F0DCA68B5FFC21A16444F9"
+               BlueprintIdentifier = "E1BA08B721CDBBEC8C82A33B"
                BuildableName = "libPods-UICKeyChainStore.a"
                BlueprintName = "Pods-UICKeyChainStore"
                ReferencedContainer = "container:Pods.xcodeproj">

diff --git a/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-UnionFind.xcscheme b/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-UnionFind.xcscheme
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "947802EC46C4B21984D869B5"
+               BlueprintIdentifier = "EE39905E1EA66E57FFF9414A"
                BuildableName = "libPods-UnionFind.a"
                BlueprintName = "Pods-UnionFind"
                ReferencedContainer = "container:Pods.xcodeproj">

diff --git a/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-YapDatabase.xcscheme b/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-YapDatabase.xcscheme
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "145392C3D706F438F2856DEB"
+               BlueprintIdentifier = "5098400D55FFB51FA7DE3C74"
                BuildableName = "libPods-YapDatabase.a"
                BlueprintName = "Pods-YapDatabase"
                ReferencedContainer = "container:Pods.xcodeproj">

diff --git a/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-libPhoneNumber-iOS.xcscheme b/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods-libPhoneNumber-iOS.xcscheme
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "6AEA110B6F136D38BCD54903"
+               BlueprintIdentifier = "CE0668B6A07DFAE563A1F28B"
                BuildableName = "libPods-libPhoneNumber-iOS.a"
                BlueprintName = "Pods-libPhoneNumber-iOS"
                ReferencedContainer = "container:Pods.xcodeproj">

diff --git a/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods.xcscheme b/Pods.xcodeproj/xcuserdata/fred.xcuserdatad/xcschemes/Pods.xcscheme
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "63B124A1F383BD07F5165C7C"
+               BlueprintIdentifier = "6165AF0754991265DCD5AC92"
                BuildableName = "libPods.a"
                BlueprintName = "Pods"
                ReferencedContainer = "container:Pods.xcodeproj">