Skip to content

Commit

Permalink
Update to 1.0.2u (1.0.2.20)
Browse files Browse the repository at this point in the history
  • Loading branch information
@krzyzanowskim
krzyzanowskim committed May 17, 2020
1 parent 07fbbf9 commit 07763ee
Show file tree
Hide file tree
Showing 33 changed files with 52 additions and 48 deletions.
2 changes: 1 addition & 1 deletion Frameworks/ios/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0.219</string>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion Frameworks/ios/OpenSSL.framework.dSYM/Contents/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleShortVersionString</key>
<string>1.0.219</string>
<string>1.0.220</string>
<key>CFBundleVersion</key>
<string>1</string>
</dict>
Expand Down
Binary file modified Frameworks/ios/OpenSSL.framework.dSYM/Contents/Resources/DWARF/OpenSSL
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions Frameworks/ios/OpenSSL.framework/Headers/opensslconf-arm64.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.G75gKHnz/1.0.2t-arm64/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.G75gKHnz/1.0.2t-arm64/ssl"
#define ENGINESDIR "/var/folders/2_/tt78sncj6p9fbmkn7808254h0000gn/T/tmp.8FhvWy5t/1.0.2u-arm64/lib/engines"
#define OPENSSLDIR "/var/folders/2_/tt78sncj6p9fbmkn7808254h0000gn/T/tmp.8FhvWy5t/1.0.2u-arm64/ssl"
#endif
#endif

Expand Down
4 changes: 2 additions & 2 deletions Frameworks/ios/OpenSSL.framework/Headers/opensslconf-armv7.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.G75gKHnz/1.0.2t-armv7/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.G75gKHnz/1.0.2t-armv7/ssl"
#define ENGINESDIR "/var/folders/2_/tt78sncj6p9fbmkn7808254h0000gn/T/tmp.8FhvWy5t/1.0.2u-armv7/lib/engines"
#define OPENSSLDIR "/var/folders/2_/tt78sncj6p9fbmkn7808254h0000gn/T/tmp.8FhvWy5t/1.0.2u-armv7/ssl"
#endif
#endif

Expand Down
4 changes: 2 additions & 2 deletions Frameworks/ios/OpenSSL.framework/Headers/opensslconf-armv7s.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.G75gKHnz/1.0.2t-armv7s/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.G75gKHnz/1.0.2t-armv7s/ssl"
#define ENGINESDIR "/var/folders/2_/tt78sncj6p9fbmkn7808254h0000gn/T/tmp.8FhvWy5t/1.0.2u-armv7s/lib/engines"
#define OPENSSLDIR "/var/folders/2_/tt78sncj6p9fbmkn7808254h0000gn/T/tmp.8FhvWy5t/1.0.2u-armv7s/ssl"
#endif
#endif

Expand Down
4 changes: 2 additions & 2 deletions Frameworks/ios/OpenSSL.framework/Headers/opensslconf-i386.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ extern "C" {

#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
#define ENGINESDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.G75gKHnz/1.0.2t-i386/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.G75gKHnz/1.0.2t-i386/ssl"
#define ENGINESDIR "/var/folders/2_/tt78sncj6p9fbmkn7808254h0000gn/T/tmp.8FhvWy5t/1.0.2u-i386/lib/engines"
#define OPENSSLDIR "/var/folders/2_/tt78sncj6p9fbmkn7808254h0000gn/T/tmp.8FhvWy5t/1.0.2u-i386/ssl"
#endif
#endif

Expand Down
4 changes: 2 additions & 2 deletions Frameworks/ios/OpenSSL.framework/Headers/opensslconf-x86_64.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ extern "C" {

#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
#define ENGINESDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.G75gKHnz/1.0.2t-x86_64/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.G75gKHnz/1.0.2t-x86_64/ssl"
#define ENGINESDIR "/var/folders/2_/tt78sncj6p9fbmkn7808254h0000gn/T/tmp.8FhvWy5t/1.0.2u-x86_64/lib/engines"
#define OPENSSLDIR "/var/folders/2_/tt78sncj6p9fbmkn7808254h0000gn/T/tmp.8FhvWy5t/1.0.2u-x86_64/ssl"
#endif
#endif

Expand Down
6 changes: 3 additions & 3 deletions Frameworks/ios/OpenSSL.framework/Headers/opensslv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 0x1000214fL
# define OPENSSL_VERSION_NUMBER 0x1000215fL
# ifdef OPENSSL_FIPS
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2t-fips 10 Sep 2019"
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2u-fips 20 Dec 2019"
# else
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2t 10 Sep 2019"
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2u 20 Dec 2019"
# endif
# define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT

Expand Down
Binary file modified Frameworks/ios/OpenSSL.framework/Info.plist
View file
Binary file not shown.
Binary file modified Frameworks/ios/OpenSSL.framework/OpenSSL
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion Frameworks/macos/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0.219</string>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion Frameworks/macos/OpenSSL.framework.dSYM/Contents/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleShortVersionString</key>
<string>1.0.219</string>
<string>1.0.220</string>
<key>CFBundleVersion</key>
<string>1</string>
</dict>
Expand Down
Binary file modified Frameworks/macos/OpenSSL.framework.dSYM/Contents/Resources/DWARF/OpenSSL
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions Frameworks/macos/OpenSSL.framework/Versions/A/Headers/opensslconf-x86_64.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ extern "C" {

#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
#define ENGINESDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.KzdBAfH9/1.0.2t-x86_64/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.KzdBAfH9/1.0.2t-x86_64/ssl"
#define ENGINESDIR "/var/folders/2_/tt78sncj6p9fbmkn7808254h0000gn/T/tmp.Jtd3NN5o/1.0.2u-x86_64/lib/engines"
#define OPENSSLDIR "/var/folders/2_/tt78sncj6p9fbmkn7808254h0000gn/T/tmp.Jtd3NN5o/1.0.2u-x86_64/ssl"
#endif
#endif

Expand Down
6 changes: 3 additions & 3 deletions Frameworks/macos/OpenSSL.framework/Versions/A/Headers/opensslv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 0x1000214fL
# define OPENSSL_VERSION_NUMBER 0x1000215fL
# ifdef OPENSSL_FIPS
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2t-fips 10 Sep 2019"
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2u-fips 20 Dec 2019"
# else
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2t 10 Sep 2019"
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2u 20 Dec 2019"
# endif
# define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT

Expand Down
Binary file modified Frameworks/macos/OpenSSL.framework/Versions/A/OpenSSL
View file
Binary file not shown.
12 changes: 6 additions & 6 deletions Frameworks/macos/OpenSSL.framework/Versions/A/Resources/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>18G103</string>
<string>19E287</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0.219</string>
<string>1.0.220</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
Expand All @@ -27,17 +27,17 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>11A1027</string>
<string>11E503a</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>19A547</string>
<string>19E258</string>
<key>DTSDKName</key>
<string>macosx10.15</string>
<key>DTXcode</key>
<string>1110</string>
<string>1141</string>
<key>DTXcodeBuild</key>
<string>11A1027</string>
<string>11E503a</string>
<key>LSMinimumSystemVersion</key>
<string>10.9</string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion OpenSSL-Universal.podspec
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "OpenSSL-Universal"
s.version = "1.0.2.#{("a".."z").to_a.index 't'}"
s.version = "1.0.2.#{("a".."z").to_a.index 'u'}"
s.summary = "OpenSSL for iOS and OS X"
s.description = "OpenSSL is an SSL/TLS and Crypto toolkit. Deprecated in Mac OS and gone in iOS, this spec gives your project non-deprecated OpenSSL support. Supports OSX and iOS including Simulator (armv7,armv7s,arm64,x86_64)."
s.homepage = "https://github.com/krzyzanowskim/OpenSSL"
Expand Down
4 changes: 4 additions & 0 deletions OpenSSL.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -965,6 +965,7 @@
"$(inherited)",
"$(PROJECT_DIR)/ios/lib",
);
MARKETING_VERSION = 1.0.220;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -1051,6 +1052,7 @@
"$(inherited)",
"$(PROJECT_DIR)/ios/lib",
);
MARKETING_VERSION = 1.0.220;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = (
Expand Down Expand Up @@ -1144,6 +1146,7 @@
"$(PROJECT_DIR)/macos/lib",
);
MACOSX_DEPLOYMENT_TARGET = 10.9;
MARKETING_VERSION = 1.0.220;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -1230,6 +1233,7 @@
"$(PROJECT_DIR)/macos/lib",
);
MACOSX_DEPLOYMENT_TARGET = 10.9;
MARKETING_VERSION = 1.0.220;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = (
Expand Down
2 changes: 1 addition & 1 deletion build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"

# Setup paths to stuff we need

OPENSSL_VERSION="1.0.2t"
OPENSSL_VERSION="1.0.2u"

DEVELOPER=$(xcode-select --print-path)

Expand Down
4 changes: 2 additions & 2 deletions ios/include/openssl/opensslconf-arm64.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.G75gKHnz/1.0.2t-arm64/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.G75gKHnz/1.0.2t-arm64/ssl"
#define ENGINESDIR "/var/folders/2_/tt78sncj6p9fbmkn7808254h0000gn/T/tmp.8FhvWy5t/1.0.2u-arm64/lib/engines"
#define OPENSSLDIR "/var/folders/2_/tt78sncj6p9fbmkn7808254h0000gn/T/tmp.8FhvWy5t/1.0.2u-arm64/ssl"
#endif
#endif

Expand Down
4 changes: 2 additions & 2 deletions ios/include/openssl/opensslconf-armv7.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.G75gKHnz/1.0.2t-armv7/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.G75gKHnz/1.0.2t-armv7/ssl"
#define ENGINESDIR "/var/folders/2_/tt78sncj6p9fbmkn7808254h0000gn/T/tmp.8FhvWy5t/1.0.2u-armv7/lib/engines"
#define OPENSSLDIR "/var/folders/2_/tt78sncj6p9fbmkn7808254h0000gn/T/tmp.8FhvWy5t/1.0.2u-armv7/ssl"
#endif
#endif

Expand Down
4 changes: 2 additions & 2 deletions ios/include/openssl/opensslconf-armv7s.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.G75gKHnz/1.0.2t-armv7s/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.G75gKHnz/1.0.2t-armv7s/ssl"
#define ENGINESDIR "/var/folders/2_/tt78sncj6p9fbmkn7808254h0000gn/T/tmp.8FhvWy5t/1.0.2u-armv7s/lib/engines"
#define OPENSSLDIR "/var/folders/2_/tt78sncj6p9fbmkn7808254h0000gn/T/tmp.8FhvWy5t/1.0.2u-armv7s/ssl"
#endif
#endif

Expand Down
4 changes: 2 additions & 2 deletions ios/include/openssl/opensslconf-i386.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ extern "C" {

#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
#define ENGINESDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.G75gKHnz/1.0.2t-i386/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.G75gKHnz/1.0.2t-i386/ssl"
#define ENGINESDIR "/var/folders/2_/tt78sncj6p9fbmkn7808254h0000gn/T/tmp.8FhvWy5t/1.0.2u-i386/lib/engines"
#define OPENSSLDIR "/var/folders/2_/tt78sncj6p9fbmkn7808254h0000gn/T/tmp.8FhvWy5t/1.0.2u-i386/ssl"
#endif
#endif

Expand Down
4 changes: 2 additions & 2 deletions ios/include/openssl/opensslconf-x86_64.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ extern "C" {

#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
#define ENGINESDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.G75gKHnz/1.0.2t-x86_64/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.G75gKHnz/1.0.2t-x86_64/ssl"
#define ENGINESDIR "/var/folders/2_/tt78sncj6p9fbmkn7808254h0000gn/T/tmp.8FhvWy5t/1.0.2u-x86_64/lib/engines"
#define OPENSSLDIR "/var/folders/2_/tt78sncj6p9fbmkn7808254h0000gn/T/tmp.8FhvWy5t/1.0.2u-x86_64/ssl"
#endif
#endif

Expand Down
Loading

0 comments on commit 07763ee

Please sign in to comment.