diff --git a/Frameworks/ios/Info.plist b/Frameworks/ios/Info.plist index 62033a8d..82790df0 100644 --- a/Frameworks/ios/Info.plist +++ b/Frameworks/ios/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.0.219 + $(MARKETING_VERSION) CFBundleVersion $(CURRENT_PROJECT_VERSION) diff --git a/Frameworks/ios/OpenSSL.framework.dSYM/Contents/Info.plist b/Frameworks/ios/OpenSSL.framework.dSYM/Contents/Info.plist index 2b9ddbf0..2f40f065 100644 --- a/Frameworks/ios/OpenSSL.framework.dSYM/Contents/Info.plist +++ b/Frameworks/ios/OpenSSL.framework.dSYM/Contents/Info.plist @@ -13,7 +13,7 @@ CFBundleSignature ???? CFBundleShortVersionString - 1.0.219 + 1.0.220 CFBundleVersion 1 diff --git a/Frameworks/ios/OpenSSL.framework.dSYM/Contents/Resources/DWARF/OpenSSL b/Frameworks/ios/OpenSSL.framework.dSYM/Contents/Resources/DWARF/OpenSSL index a78b80c9..656c2bc8 100644 Binary files a/Frameworks/ios/OpenSSL.framework.dSYM/Contents/Resources/DWARF/OpenSSL and b/Frameworks/ios/OpenSSL.framework.dSYM/Contents/Resources/DWARF/OpenSSL differ diff --git a/Frameworks/ios/OpenSSL.framework/Headers/opensslconf-arm64.h b/Frameworks/ios/OpenSSL.framework/Headers/opensslconf-arm64.h index 21630b77..7769fa06 100644 --- a/Frameworks/ios/OpenSSL.framework/Headers/opensslconf-arm64.h +++ b/Frameworks/ios/OpenSSL.framework/Headers/opensslconf-arm64.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 "/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 diff --git a/Frameworks/ios/OpenSSL.framework/Headers/opensslconf-armv7.h b/Frameworks/ios/OpenSSL.framework/Headers/opensslconf-armv7.h index ebc589f9..ad6622af 100644 --- a/Frameworks/ios/OpenSSL.framework/Headers/opensslconf-armv7.h +++ b/Frameworks/ios/OpenSSL.framework/Headers/opensslconf-armv7.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 "/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 diff --git a/Frameworks/ios/OpenSSL.framework/Headers/opensslconf-armv7s.h b/Frameworks/ios/OpenSSL.framework/Headers/opensslconf-armv7s.h index d441feec..893a2ede 100644 --- a/Frameworks/ios/OpenSSL.framework/Headers/opensslconf-armv7s.h +++ b/Frameworks/ios/OpenSSL.framework/Headers/opensslconf-armv7s.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 "/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 diff --git a/Frameworks/ios/OpenSSL.framework/Headers/opensslconf-i386.h b/Frameworks/ios/OpenSSL.framework/Headers/opensslconf-i386.h index a3323808..d57bf40a 100644 --- a/Frameworks/ios/OpenSSL.framework/Headers/opensslconf-i386.h +++ b/Frameworks/ios/OpenSSL.framework/Headers/opensslconf-i386.h @@ -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 diff --git a/Frameworks/ios/OpenSSL.framework/Headers/opensslconf-x86_64.h b/Frameworks/ios/OpenSSL.framework/Headers/opensslconf-x86_64.h index 6925a1d5..1a6184f6 100644 --- a/Frameworks/ios/OpenSSL.framework/Headers/opensslconf-x86_64.h +++ b/Frameworks/ios/OpenSSL.framework/Headers/opensslconf-x86_64.h @@ -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 diff --git a/Frameworks/ios/OpenSSL.framework/Headers/opensslv.h b/Frameworks/ios/OpenSSL.framework/Headers/opensslv.h index 488e2bc4..81b02e5f 100644 --- a/Frameworks/ios/OpenSSL.framework/Headers/opensslv.h +++ b/Frameworks/ios/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 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 diff --git a/Frameworks/ios/OpenSSL.framework/Info.plist b/Frameworks/ios/OpenSSL.framework/Info.plist index b38f520a..4d0e265b 100644 Binary files a/Frameworks/ios/OpenSSL.framework/Info.plist and b/Frameworks/ios/OpenSSL.framework/Info.plist differ diff --git a/Frameworks/ios/OpenSSL.framework/OpenSSL b/Frameworks/ios/OpenSSL.framework/OpenSSL index 1120ead6..8e5154cb 100755 Binary files a/Frameworks/ios/OpenSSL.framework/OpenSSL and b/Frameworks/ios/OpenSSL.framework/OpenSSL differ diff --git a/Frameworks/macos/Info.plist b/Frameworks/macos/Info.plist index 62033a8d..82790df0 100644 --- a/Frameworks/macos/Info.plist +++ b/Frameworks/macos/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.0.219 + $(MARKETING_VERSION) CFBundleVersion $(CURRENT_PROJECT_VERSION) diff --git a/Frameworks/macos/OpenSSL.framework.dSYM/Contents/Info.plist b/Frameworks/macos/OpenSSL.framework.dSYM/Contents/Info.plist index 2b9ddbf0..2f40f065 100644 --- a/Frameworks/macos/OpenSSL.framework.dSYM/Contents/Info.plist +++ b/Frameworks/macos/OpenSSL.framework.dSYM/Contents/Info.plist @@ -13,7 +13,7 @@ CFBundleSignature ???? CFBundleShortVersionString - 1.0.219 + 1.0.220 CFBundleVersion 1 diff --git a/Frameworks/macos/OpenSSL.framework.dSYM/Contents/Resources/DWARF/OpenSSL b/Frameworks/macos/OpenSSL.framework.dSYM/Contents/Resources/DWARF/OpenSSL index 87b20f3d..7a7dcce3 100644 Binary files a/Frameworks/macos/OpenSSL.framework.dSYM/Contents/Resources/DWARF/OpenSSL and b/Frameworks/macos/OpenSSL.framework.dSYM/Contents/Resources/DWARF/OpenSSL differ diff --git a/Frameworks/macos/OpenSSL.framework/Versions/A/Headers/opensslconf-x86_64.h b/Frameworks/macos/OpenSSL.framework/Versions/A/Headers/opensslconf-x86_64.h index b7dc900f..f7b756e2 100644 --- a/Frameworks/macos/OpenSSL.framework/Versions/A/Headers/opensslconf-x86_64.h +++ b/Frameworks/macos/OpenSSL.framework/Versions/A/Headers/opensslconf-x86_64.h @@ -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 diff --git a/Frameworks/macos/OpenSSL.framework/Versions/A/Headers/opensslv.h b/Frameworks/macos/OpenSSL.framework/Versions/A/Headers/opensslv.h index 488e2bc4..81b02e5f 100644 --- a/Frameworks/macos/OpenSSL.framework/Versions/A/Headers/opensslv.h +++ b/Frameworks/macos/OpenSSL.framework/Versions/A/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 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 diff --git a/Frameworks/macos/OpenSSL.framework/Versions/A/OpenSSL b/Frameworks/macos/OpenSSL.framework/Versions/A/OpenSSL index e30b62c0..e05dd62d 100755 Binary files a/Frameworks/macos/OpenSSL.framework/Versions/A/OpenSSL and b/Frameworks/macos/OpenSSL.framework/Versions/A/OpenSSL differ diff --git a/Frameworks/macos/OpenSSL.framework/Versions/A/Resources/Info.plist b/Frameworks/macos/OpenSSL.framework/Versions/A/Resources/Info.plist index bf7d53a2..84e67317 100644 --- a/Frameworks/macos/OpenSSL.framework/Versions/A/Resources/Info.plist +++ b/Frameworks/macos/OpenSSL.framework/Versions/A/Resources/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 18G103 + 19E287 CFBundleDevelopmentRegion en CFBundleExecutable @@ -17,7 +17,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.0.219 + 1.0.220 CFBundleSupportedPlatforms MacOSX @@ -27,17 +27,17 @@ DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 11A1027 + 11E503a DTPlatformVersion GM DTSDKBuild - 19A547 + 19E258 DTSDKName macosx10.15 DTXcode - 1110 + 1141 DTXcodeBuild - 11A1027 + 11E503a LSMinimumSystemVersion 10.9 diff --git a/OpenSSL-Universal.podspec b/OpenSSL-Universal.podspec index b480853d..67e797a1 100644 --- a/OpenSSL-Universal.podspec +++ b/OpenSSL-Universal.podspec @@ -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" diff --git a/OpenSSL.xcodeproj/project.pbxproj b/OpenSSL.xcodeproj/project.pbxproj index 8ddbd2f3..a5e1a158 100644 --- a/OpenSSL.xcodeproj/project.pbxproj +++ b/OpenSSL.xcodeproj/project.pbxproj @@ -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; @@ -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 = ( @@ -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; @@ -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 = ( diff --git a/build.sh b/build.sh index a696bc8d..aab619dc 100755 --- a/build.sh +++ b/build.sh @@ -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) diff --git a/ios/include/openssl/opensslconf-arm64.h b/ios/include/openssl/opensslconf-arm64.h index 21630b77..7769fa06 100644 --- a/ios/include/openssl/opensslconf-arm64.h +++ b/ios/include/openssl/opensslconf-arm64.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 "/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 diff --git a/ios/include/openssl/opensslconf-armv7.h b/ios/include/openssl/opensslconf-armv7.h index ebc589f9..ad6622af 100644 --- a/ios/include/openssl/opensslconf-armv7.h +++ b/ios/include/openssl/opensslconf-armv7.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 "/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 diff --git a/ios/include/openssl/opensslconf-armv7s.h b/ios/include/openssl/opensslconf-armv7s.h index d441feec..893a2ede 100644 --- a/ios/include/openssl/opensslconf-armv7s.h +++ b/ios/include/openssl/opensslconf-armv7s.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 "/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 diff --git a/ios/include/openssl/opensslconf-i386.h b/ios/include/openssl/opensslconf-i386.h index a3323808..d57bf40a 100644 --- a/ios/include/openssl/opensslconf-i386.h +++ b/ios/include/openssl/opensslconf-i386.h @@ -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 diff --git a/ios/include/openssl/opensslconf-x86_64.h b/ios/include/openssl/opensslconf-x86_64.h index 6925a1d5..1a6184f6 100644 --- a/ios/include/openssl/opensslconf-x86_64.h +++ b/ios/include/openssl/opensslconf-x86_64.h @@ -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 diff --git a/ios/include/openssl/opensslv.h b/ios/include/openssl/opensslv.h index 488e2bc4..81b02e5f 100644 --- a/ios/include/openssl/opensslv.h +++ b/ios/include/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 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 diff --git a/ios/lib/libcrypto.a b/ios/lib/libcrypto.a index 33bfd112..e01c7add 100644 Binary files a/ios/lib/libcrypto.a and b/ios/lib/libcrypto.a differ diff --git a/ios/lib/libssl.a b/ios/lib/libssl.a index 1c43b63a..197e4a0b 100644 Binary files a/ios/lib/libssl.a and b/ios/lib/libssl.a differ diff --git a/macos/include/openssl/opensslconf-x86_64.h b/macos/include/openssl/opensslconf-x86_64.h index b7dc900f..f7b756e2 100644 --- a/macos/include/openssl/opensslconf-x86_64.h +++ b/macos/include/openssl/opensslconf-x86_64.h @@ -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 diff --git a/macos/include/openssl/opensslv.h b/macos/include/openssl/opensslv.h index 488e2bc4..81b02e5f 100644 --- a/macos/include/openssl/opensslv.h +++ b/macos/include/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 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 diff --git a/macos/lib/libcrypto.a b/macos/lib/libcrypto.a index b25941aa..0cbbbb4e 100644 Binary files a/macos/lib/libcrypto.a and b/macos/lib/libcrypto.a differ diff --git a/macos/lib/libssl.a b/macos/lib/libssl.a index 334bd0d0..790a2801 100644 Binary files a/macos/lib/libssl.a and b/macos/lib/libssl.a differ