From 059945d717ebaf7817f7a8ff58e387941b36886b Mon Sep 17 00:00:00 2001 From: Marcin Krzyzanowski Date: Fri, 20 Nov 2020 04:02:14 +0100 Subject: [PATCH] Fix RC4_INT redefinition --- Frameworks/OpenSSL.xcframework/Info.plist | 20 +- .../Headers/opensslconf-arm64.h | 3 + .../Headers/opensslconf-arm64e.h | 3 + .../Headers/opensslconf-armv7.h | 3 + .../Headers/opensslconf-armv7s.h | 3 + .../Headers/opensslconf-i386.h | 212 ++++++++++++++++++ .../Headers/opensslconf-x86_64.h | 212 ++++++++++++++++++ .../ios-arm64_armv7/OpenSSL.framework/OpenSSL | Bin 4541976 -> 4541976 bytes .../Headers/opensslconf-arm64.h | 3 + .../Headers/opensslconf-arm64e.h | 3 + .../Headers/opensslconf-armv7.h | 3 + .../Headers/opensslconf-armv7s.h | 3 + .../OpenSSL.framework/OpenSSL | Bin 256816 -> 256816 bytes .../_CodeSignature/CodeResources | 24 +- .../Headers/opensslconf-arm64.h | 3 + .../OpenSSL.framework/OpenSSL | Bin 5284480 -> 5284480 bytes .../Versions/A/Headers/opensslconf-arm64.h | 3 + .../OpenSSL.framework/Versions/A/OpenSSL | Bin 5284480 -> 5284480 bytes .../Versions/A/_CodeSignature/CodeResources | 4 +- .../Current/Headers/opensslconf-arm64.h | 3 + .../Versions/Current/OpenSSL | Bin 5284480 -> 5284480 bytes .../Current/_CodeSignature/CodeResources | 4 +- .../Headers/opensslconf-arm64.h | 3 + .../Headers/opensslconf-arm64e.h | 3 + .../Headers/opensslconf-armv7.h | 3 + .../Headers/opensslconf-armv7s.h | 3 + .../Headers/opensslconf-i386.h | 212 ++++++++++++++++++ .../Headers/opensslconf-x86_64.h | 212 ++++++++++++++++++ Frameworks/iphoneos/OpenSSL.framework/OpenSSL | Bin 4541976 -> 4541976 bytes .../Headers/opensslconf-arm64.h | 3 + .../Headers/opensslconf-arm64e.h | 3 + .../Headers/opensslconf-armv7.h | 3 + .../Headers/opensslconf-armv7s.h | 3 + .../iphonesimulator/OpenSSL.framework/OpenSSL | Bin 256816 -> 256816 bytes .../_CodeSignature/CodeResources | 24 +- .../Headers/opensslconf-arm64.h | 3 + Frameworks/macos/OpenSSL.framework/OpenSSL | Bin 5284480 -> 5284480 bytes .../Versions/A/Headers/opensslconf-arm64.h | 3 + .../OpenSSL.framework/Versions/A/OpenSSL | Bin 5284480 -> 5284480 bytes .../Versions/A/_CodeSignature/CodeResources | 4 +- .../Current/Headers/opensslconf-arm64.h | 3 + .../Versions/Current/OpenSSL | Bin 5284480 -> 5284480 bytes .../Current/_CodeSignature/CodeResources | 4 +- OpenSSL.xcodeproj/project.pbxproj | 4 +- iphoneos/include/openssl/opensslconf-arm64.h | 3 + iphoneos/include/openssl/opensslconf-arm64e.h | 3 + iphoneos/include/openssl/opensslconf-armv7.h | 3 + iphoneos/include/openssl/opensslconf-armv7s.h | 3 + .../include/openssl/opensslconf-arm64.h | 3 + macos/include/openssl/opensslconf-arm64.h | 3 + scripts/build.sh | 16 +- 51 files changed, 985 insertions(+), 51 deletions(-) create mode 100644 Frameworks/OpenSSL.xcframework/ios-arm64_armv7/OpenSSL.framework/Headers/opensslconf-i386.h create mode 100644 Frameworks/OpenSSL.xcframework/ios-arm64_armv7/OpenSSL.framework/Headers/opensslconf-x86_64.h create mode 100644 Frameworks/iphoneos/OpenSSL.framework/Headers/opensslconf-i386.h create mode 100644 Frameworks/iphoneos/OpenSSL.framework/Headers/opensslconf-x86_64.h diff --git a/Frameworks/OpenSSL.xcframework/Info.plist b/Frameworks/OpenSSL.xcframework/Info.plist index 77364522..0a1e1e43 100644 --- a/Frameworks/OpenSSL.xcframework/Info.plist +++ b/Frameworks/OpenSSL.xcframework/Info.plist @@ -6,45 +6,45 @@ LibraryIdentifier - ios-arm64_armv7 + macos-arm64_x86_64 LibraryPath OpenSSL.framework SupportedArchitectures arm64 - armv7 + x86_64 SupportedPlatform - ios + macos LibraryIdentifier - ios-arm64_i386_x86_64-simulator + ios-arm64_armv7 LibraryPath OpenSSL.framework SupportedArchitectures arm64 - i386 - x86_64 + armv7 SupportedPlatform ios - SupportedPlatformVariant - simulator LibraryIdentifier - macos-arm64_x86_64 + ios-arm64_i386_x86_64-simulator LibraryPath OpenSSL.framework SupportedArchitectures arm64 + i386 x86_64 SupportedPlatform - macos + ios + SupportedPlatformVariant + simulator CFBundlePackageType diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_armv7/OpenSSL.framework/Headers/opensslconf-arm64.h b/Frameworks/OpenSSL.xcframework/ios-arm64_armv7/OpenSSL.framework/Headers/opensslconf-arm64.h index 7b8e8592..2955b9a9 100644 --- a/Frameworks/OpenSSL.xcframework/ios-arm64_armv7/OpenSSL.framework/Headers/opensslconf-arm64.h +++ b/Frameworks/OpenSSL.xcframework/ios-arm64_armv7/OpenSSL.framework/Headers/opensslconf-arm64.h @@ -205,7 +205,10 @@ extern "C" { # undef THIRTY_TWO_BIT #endif +#if !defined(RC4_INT) #define RC4_INT unsigned char +#endif + #ifdef __cplusplus } diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_armv7/OpenSSL.framework/Headers/opensslconf-arm64e.h b/Frameworks/OpenSSL.xcframework/ios-arm64_armv7/OpenSSL.framework/Headers/opensslconf-arm64e.h index 7b8e8592..2955b9a9 100644 --- a/Frameworks/OpenSSL.xcframework/ios-arm64_armv7/OpenSSL.framework/Headers/opensslconf-arm64e.h +++ b/Frameworks/OpenSSL.xcframework/ios-arm64_armv7/OpenSSL.framework/Headers/opensslconf-arm64e.h @@ -205,7 +205,10 @@ extern "C" { # undef THIRTY_TWO_BIT #endif +#if !defined(RC4_INT) #define RC4_INT unsigned char +#endif + #ifdef __cplusplus } diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_armv7/OpenSSL.framework/Headers/opensslconf-armv7.h b/Frameworks/OpenSSL.xcframework/ios-arm64_armv7/OpenSSL.framework/Headers/opensslconf-armv7.h index 3bc97d69..be248fa7 100644 --- a/Frameworks/OpenSSL.xcframework/ios-arm64_armv7/OpenSSL.framework/Headers/opensslconf-armv7.h +++ b/Frameworks/OpenSSL.xcframework/ios-arm64_armv7/OpenSSL.framework/Headers/opensslconf-armv7.h @@ -205,7 +205,10 @@ extern "C" { # define THIRTY_TWO_BIT #endif +#if !defined(RC4_INT) #define RC4_INT unsigned char +#endif + #ifdef __cplusplus } diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_armv7/OpenSSL.framework/Headers/opensslconf-armv7s.h b/Frameworks/OpenSSL.xcframework/ios-arm64_armv7/OpenSSL.framework/Headers/opensslconf-armv7s.h index 3bc97d69..be248fa7 100644 --- a/Frameworks/OpenSSL.xcframework/ios-arm64_armv7/OpenSSL.framework/Headers/opensslconf-armv7s.h +++ b/Frameworks/OpenSSL.xcframework/ios-arm64_armv7/OpenSSL.framework/Headers/opensslconf-armv7s.h @@ -205,7 +205,10 @@ extern "C" { # define THIRTY_TWO_BIT #endif +#if !defined(RC4_INT) #define RC4_INT unsigned char +#endif + #ifdef __cplusplus } diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_armv7/OpenSSL.framework/Headers/opensslconf-i386.h b/Frameworks/OpenSSL.xcframework/ios-arm64_armv7/OpenSSL.framework/Headers/opensslconf-i386.h new file mode 100644 index 00000000..01a06f7e --- /dev/null +++ b/Frameworks/OpenSSL.xcframework/ios-arm64_armv7/OpenSSL.framework/Headers/opensslconf-i386.h @@ -0,0 +1,212 @@ +/* + * WARNING: do not edit! + * Generated by Makefile from include/openssl/opensslconf.h.in + * + * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef OPENSSL_ALGORITHM_DEFINES +# error OPENSSL_ALGORITHM_DEFINES no longer supported +#endif + +/* + * OpenSSL was configured with the following options: + */ + +#ifndef OPENSSL_SYS_iOS +# define OPENSSL_SYS_iOS 1 +#endif +#ifndef OPENSSL_NO_MD2 +# define OPENSSL_NO_MD2 +#endif +#ifndef OPENSSL_NO_RC5 +# define OPENSSL_NO_RC5 +#endif +#ifndef OPENSSL_THREADS +# define OPENSSL_THREADS +#endif +#ifndef OPENSSL_RAND_SEED_OS +# define OPENSSL_RAND_SEED_OS +#endif +#ifndef OPENSSL_NO_AFALGENG +# define OPENSSL_NO_AFALGENG +#endif +#ifndef OPENSSL_NO_ASAN +# define OPENSSL_NO_ASAN +#endif +#ifndef OPENSSL_NO_ASM +# define OPENSSL_NO_ASM +#endif +#ifndef OPENSSL_NO_ASYNC +# define OPENSSL_NO_ASYNC +#endif +#ifndef OPENSSL_NO_CRYPTO_MDEBUG +# define OPENSSL_NO_CRYPTO_MDEBUG +#endif +#ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE +# define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE +#endif +#ifndef OPENSSL_NO_DEVCRYPTOENG +# define OPENSSL_NO_DEVCRYPTOENG +#endif +#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 +# define OPENSSL_NO_EC_NISTP_64_GCC_128 +#endif +#ifndef OPENSSL_NO_EGD +# define OPENSSL_NO_EGD +#endif +#ifndef OPENSSL_NO_ENGINE +# define OPENSSL_NO_ENGINE +#endif +#ifndef OPENSSL_NO_EXTERNAL_TESTS +# define OPENSSL_NO_EXTERNAL_TESTS +#endif +#ifndef OPENSSL_NO_FUZZ_AFL +# define OPENSSL_NO_FUZZ_AFL +#endif +#ifndef OPENSSL_NO_FUZZ_LIBFUZZER +# define OPENSSL_NO_FUZZ_LIBFUZZER +#endif +#ifndef OPENSSL_NO_HEARTBEATS +# define OPENSSL_NO_HEARTBEATS +#endif +#ifndef OPENSSL_NO_MSAN +# define OPENSSL_NO_MSAN +#endif +#ifndef OPENSSL_NO_SCTP +# define OPENSSL_NO_SCTP +#endif +#ifndef OPENSSL_NO_SSL_TRACE +# define OPENSSL_NO_SSL_TRACE +#endif +#ifndef OPENSSL_NO_SSL3 +# define OPENSSL_NO_SSL3 +#endif +#ifndef OPENSSL_NO_SSL3_METHOD +# define OPENSSL_NO_SSL3_METHOD +#endif +#ifndef OPENSSL_NO_UBSAN +# define OPENSSL_NO_UBSAN +#endif +#ifndef OPENSSL_NO_UNIT_TEST +# define OPENSSL_NO_UNIT_TEST +#endif +#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS +# define OPENSSL_NO_WEAK_SSL_CIPHERS +#endif +#ifndef OPENSSL_NO_DYNAMIC_ENGINE +# define OPENSSL_NO_DYNAMIC_ENGINE +#endif + + +/* + * Sometimes OPENSSSL_NO_xxx ends up with an empty file and some compilers + * don't like that. This will hopefully silence them. + */ +#define NON_EMPTY_TRANSLATION_UNIT static void *dummy = &dummy; + +/* + * Applications should use -DOPENSSL_API_COMPAT= to suppress the + * declarations of functions deprecated in or before . Otherwise, they + * still won't see them if the library has been built to disable deprecated + * functions. + */ +#ifndef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# elif defined(__SUNPRO_C) +# if (__SUNPRO_C >= 0x5130) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +#endif + +#ifndef OPENSSL_FILE +# ifdef OPENSSL_NO_FILENAMES +# define OPENSSL_FILE "" +# define OPENSSL_LINE 0 +# else +# define OPENSSL_FILE __FILE__ +# define OPENSSL_LINE __LINE__ +# endif +#endif + +#ifndef OPENSSL_MIN_API +# define OPENSSL_MIN_API 0 +#endif + +#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < OPENSSL_MIN_API +# undef OPENSSL_API_COMPAT +# define OPENSSL_API_COMPAT OPENSSL_MIN_API +#endif + +/* + * Do not deprecate things to be deprecated in version 1.2.0 before the + * OpenSSL version number matches. + */ +#if OPENSSL_VERSION_NUMBER < 0x10200000L +# define DEPRECATEDIN_1_2_0(f) f; +#elif OPENSSL_API_COMPAT < 0x10200000L +# define DEPRECATEDIN_1_2_0(f) DECLARE_DEPRECATED(f) +#else +# define DEPRECATEDIN_1_2_0(f) +#endif + +#if OPENSSL_API_COMPAT < 0x10100000L +# define DEPRECATEDIN_1_1_0(f) DECLARE_DEPRECATED(f) +#else +# define DEPRECATEDIN_1_1_0(f) +#endif + +#if OPENSSL_API_COMPAT < 0x10000000L +# define DEPRECATEDIN_1_0_0(f) DECLARE_DEPRECATED(f) +#else +# define DEPRECATEDIN_1_0_0(f) +#endif + +#if OPENSSL_API_COMPAT < 0x00908000L +# define DEPRECATEDIN_0_9_8(f) DECLARE_DEPRECATED(f) +#else +# define DEPRECATEDIN_0_9_8(f) +#endif + +/* Generate 80386 code? */ +#undef I386_ONLY + +#undef OPENSSL_UNISTD +#define OPENSSL_UNISTD + +#undef OPENSSL_EXPORT_VAR_AS_FUNCTION + +/* + * The following are cipher-specific, but are part of the public API. + */ +#if !defined(OPENSSL_SYS_UEFI) +# define BN_LLONG +/* Only one for the following should be defined */ +# undef SIXTY_FOUR_BIT_LONG +# undef SIXTY_FOUR_BIT +# define THIRTY_TWO_BIT +#endif + +#define RC4_INT unsigned int + +#ifdef __cplusplus +} +#endif diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_armv7/OpenSSL.framework/Headers/opensslconf-x86_64.h b/Frameworks/OpenSSL.xcframework/ios-arm64_armv7/OpenSSL.framework/Headers/opensslconf-x86_64.h new file mode 100644 index 00000000..42109240 --- /dev/null +++ b/Frameworks/OpenSSL.xcframework/ios-arm64_armv7/OpenSSL.framework/Headers/opensslconf-x86_64.h @@ -0,0 +1,212 @@ +/* + * WARNING: do not edit! + * Generated by Makefile from include/openssl/opensslconf.h.in + * + * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef OPENSSL_ALGORITHM_DEFINES +# error OPENSSL_ALGORITHM_DEFINES no longer supported +#endif + +/* + * OpenSSL was configured with the following options: + */ + +#ifndef OPENSSL_SYS_iOS +# define OPENSSL_SYS_iOS 1 +#endif +#ifndef OPENSSL_NO_MD2 +# define OPENSSL_NO_MD2 +#endif +#ifndef OPENSSL_NO_RC5 +# define OPENSSL_NO_RC5 +#endif +#ifndef OPENSSL_THREADS +# define OPENSSL_THREADS +#endif +#ifndef OPENSSL_RAND_SEED_OS +# define OPENSSL_RAND_SEED_OS +#endif +#ifndef OPENSSL_NO_AFALGENG +# define OPENSSL_NO_AFALGENG +#endif +#ifndef OPENSSL_NO_ASAN +# define OPENSSL_NO_ASAN +#endif +#ifndef OPENSSL_NO_ASM +# define OPENSSL_NO_ASM +#endif +#ifndef OPENSSL_NO_ASYNC +# define OPENSSL_NO_ASYNC +#endif +#ifndef OPENSSL_NO_CRYPTO_MDEBUG +# define OPENSSL_NO_CRYPTO_MDEBUG +#endif +#ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE +# define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE +#endif +#ifndef OPENSSL_NO_DEVCRYPTOENG +# define OPENSSL_NO_DEVCRYPTOENG +#endif +#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 +# define OPENSSL_NO_EC_NISTP_64_GCC_128 +#endif +#ifndef OPENSSL_NO_EGD +# define OPENSSL_NO_EGD +#endif +#ifndef OPENSSL_NO_ENGINE +# define OPENSSL_NO_ENGINE +#endif +#ifndef OPENSSL_NO_EXTERNAL_TESTS +# define OPENSSL_NO_EXTERNAL_TESTS +#endif +#ifndef OPENSSL_NO_FUZZ_AFL +# define OPENSSL_NO_FUZZ_AFL +#endif +#ifndef OPENSSL_NO_FUZZ_LIBFUZZER +# define OPENSSL_NO_FUZZ_LIBFUZZER +#endif +#ifndef OPENSSL_NO_HEARTBEATS +# define OPENSSL_NO_HEARTBEATS +#endif +#ifndef OPENSSL_NO_MSAN +# define OPENSSL_NO_MSAN +#endif +#ifndef OPENSSL_NO_SCTP +# define OPENSSL_NO_SCTP +#endif +#ifndef OPENSSL_NO_SSL_TRACE +# define OPENSSL_NO_SSL_TRACE +#endif +#ifndef OPENSSL_NO_SSL3 +# define OPENSSL_NO_SSL3 +#endif +#ifndef OPENSSL_NO_SSL3_METHOD +# define OPENSSL_NO_SSL3_METHOD +#endif +#ifndef OPENSSL_NO_UBSAN +# define OPENSSL_NO_UBSAN +#endif +#ifndef OPENSSL_NO_UNIT_TEST +# define OPENSSL_NO_UNIT_TEST +#endif +#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS +# define OPENSSL_NO_WEAK_SSL_CIPHERS +#endif +#ifndef OPENSSL_NO_DYNAMIC_ENGINE +# define OPENSSL_NO_DYNAMIC_ENGINE +#endif + + +/* + * Sometimes OPENSSSL_NO_xxx ends up with an empty file and some compilers + * don't like that. This will hopefully silence them. + */ +#define NON_EMPTY_TRANSLATION_UNIT static void *dummy = &dummy; + +/* + * Applications should use -DOPENSSL_API_COMPAT= to suppress the + * declarations of functions deprecated in or before . Otherwise, they + * still won't see them if the library has been built to disable deprecated + * functions. + */ +#ifndef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# elif defined(__SUNPRO_C) +# if (__SUNPRO_C >= 0x5130) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +#endif + +#ifndef OPENSSL_FILE +# ifdef OPENSSL_NO_FILENAMES +# define OPENSSL_FILE "" +# define OPENSSL_LINE 0 +# else +# define OPENSSL_FILE __FILE__ +# define OPENSSL_LINE __LINE__ +# endif +#endif + +#ifndef OPENSSL_MIN_API +# define OPENSSL_MIN_API 0 +#endif + +#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < OPENSSL_MIN_API +# undef OPENSSL_API_COMPAT +# define OPENSSL_API_COMPAT OPENSSL_MIN_API +#endif + +/* + * Do not deprecate things to be deprecated in version 1.2.0 before the + * OpenSSL version number matches. + */ +#if OPENSSL_VERSION_NUMBER < 0x10200000L +# define DEPRECATEDIN_1_2_0(f) f; +#elif OPENSSL_API_COMPAT < 0x10200000L +# define DEPRECATEDIN_1_2_0(f) DECLARE_DEPRECATED(f) +#else +# define DEPRECATEDIN_1_2_0(f) +#endif + +#if OPENSSL_API_COMPAT < 0x10100000L +# define DEPRECATEDIN_1_1_0(f) DECLARE_DEPRECATED(f) +#else +# define DEPRECATEDIN_1_1_0(f) +#endif + +#if OPENSSL_API_COMPAT < 0x10000000L +# define DEPRECATEDIN_1_0_0(f) DECLARE_DEPRECATED(f) +#else +# define DEPRECATEDIN_1_0_0(f) +#endif + +#if OPENSSL_API_COMPAT < 0x00908000L +# define DEPRECATEDIN_0_9_8(f) DECLARE_DEPRECATED(f) +#else +# define DEPRECATEDIN_0_9_8(f) +#endif + +/* Generate 80386 code? */ +#undef I386_ONLY + +#undef OPENSSL_UNISTD +#define OPENSSL_UNISTD + +#undef OPENSSL_EXPORT_VAR_AS_FUNCTION + +/* + * The following are cipher-specific, but are part of the public API. + */ +#if !defined(OPENSSL_SYS_UEFI) +# undef BN_LLONG +/* Only one for the following should be defined */ +# define SIXTY_FOUR_BIT_LONG +# undef SIXTY_FOUR_BIT +# undef THIRTY_TWO_BIT +#endif + +#define RC4_INT unsigned int + +#ifdef __cplusplus +} +#endif diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_armv7/OpenSSL.framework/OpenSSL b/Frameworks/OpenSSL.xcframework/ios-arm64_armv7/OpenSSL.framework/OpenSSL index 8216bf486969ebd6815bd574d7caa7796488183d..0bbc962b1c6a28e720ed866c192a218c7f348b6f 100755 GIT binary patch delta 319 zcmZwCJ4-?V0ES^YWtmoX)ygtYcQr4kyVWVp&LRj65wt}@dqcJgejvEZap(txvv4;5 zMT7sQ*Tt#fS>EaUI^S)hgSy6KXj~KWX;M@2Ygz#XHKSS0DWrKVXi-aA){4T4XjN-k z??r!1qhU3>W)vIP^txv3)$@ORy}vwL`I_4w#2(#9#d#W~CJ9@J!^Adru!}wH;{b<9 zAc+)?kVXbs-+`z^y?!5k>(5epSm+d0%QNn{)ww=$=XzxE4 LhUv}ytvIDWV~dWn delta 319 zcmZwCIZgrr0EOW=Zipyuh=3xapdcZg9Dq=p zOvf!OxQ#yzmBrWm)qB1Ex6#9=W@KnqbDGzJ7Uj{Byjqq|D_WIbYg*TaHnpXIwiVQl zLJI#x2BuL=bcbdHyV!GwX0+jYGKJcEtNGD(M&szK6Rg_xY3h=&j~GlG;1F>naD-zd zk-`bmIK>&xae)jjafK{$$m1F}DBu=%xW@x5Jfi51#!p{wllc|v86}kQ;#MrX3a1ApW~iX8ow;Px^eISC7a)sR9$rQ4YJy? z`U<0%*yPGftqP^@)owC}> zI8({L6P2qPOA;IJy91q@l)W+G3uBuD(>4cY13!?{jry4H@DXsj^E~EHSe?Gzb3XG9 zMh(IGb63PJA6Ril?&Y)!qf`FHJ3>~-aL;}9Qb#2C(JRe;YbNKWK5A^3JY91kGhq*H zKev$i0F%RW#>?rc%l-a-EB|E9W4_gPZGCOCc(mJ1kEdU@oY}tQ((Pj}n{4N}J+PiR fNw?bga^6e32K!(8e~CvvOuVq*$$}ps-?{++lJ+R` delta 638 zcmdmRjei3WSsY_>Qr&EIOoo%AG&HZ&D9hh_a@_f?$ehHcVBTj(bLj>ZL{2E2S$f^ zJAb@>IqfmWq-^~w)z_EtvzgBGddvIoT0-yYf{2+eZDFg!_*l)wBFt7VW1iB+@H{aq ztIe5drOFk9PmiXl?Y*>l-jzikfd1OW18R(VeT^AV{6(*Fu?(Ausz`bQ9>rS!eO$)p> zba9IdgnwRm-|WrX$}9hX&P~eRnDB+M&4Fo~1G9l2$mvFX%y;+*INf<3^CzrM-|jh| zc?YA0br-kO4QKBw`O%%i6Bq0?|Ep#desHnpX5sYc4cETqbICk9&+H&8vwFJbLT17q z+J0^!^8qG@lPlKt1(_GwU!G|C^`=TvVA7W~EB7$@Nkw(sRSoV^Mh>_B%G4aN(!MJ` eW9A91gvMkpiGXI&kB>d?D;Bi0jnTmjx$^U diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_i386_x86_64-simulator/OpenSSL.framework/_CodeSignature/CodeResources b/Frameworks/OpenSSL.xcframework/ios-arm64_i386_x86_64-simulator/OpenSSL.framework/_CodeSignature/CodeResources index c146b5df..f1a60763 100644 --- a/Frameworks/OpenSSL.xcframework/ios-arm64_i386_x86_64-simulator/OpenSSL.framework/_CodeSignature/CodeResources +++ b/Frameworks/OpenSSL.xcframework/ios-arm64_i386_x86_64-simulator/OpenSSL.framework/_CodeSignature/CodeResources @@ -246,19 +246,19 @@ Headers/opensslconf-arm64.h - rQ63UQXkdQJaEMcIP0AkuDjVt0I= + bANfjjQphQdSV8v5cxoKMD25BJU= Headers/opensslconf-arm64e.h - rQ63UQXkdQJaEMcIP0AkuDjVt0I= + bANfjjQphQdSV8v5cxoKMD25BJU= Headers/opensslconf-armv7.h - RUtKEytWAQ250/iNbJ5hs6iXnKY= + K17TNpd3ba1hmUD57gHJLhC4tkA= Headers/opensslconf-armv7s.h - RUtKEytWAQ250/iNbJ5hs6iXnKY= + K17TNpd3ba1hmUD57gHJLhC4tkA= Headers/opensslconf-i386.h @@ -1123,44 +1123,44 @@ hash - rQ63UQXkdQJaEMcIP0AkuDjVt0I= + bANfjjQphQdSV8v5cxoKMD25BJU= hash2 - bHBRXVtoqdJn2RZmQmW7Ot9lNHksh6O5z0XV7KLVC9E= + IYBWed9nlMdO53oLf0K5SA6xDwrQGKVt06rdNR+unGU= Headers/opensslconf-arm64e.h hash - rQ63UQXkdQJaEMcIP0AkuDjVt0I= + bANfjjQphQdSV8v5cxoKMD25BJU= hash2 - bHBRXVtoqdJn2RZmQmW7Ot9lNHksh6O5z0XV7KLVC9E= + IYBWed9nlMdO53oLf0K5SA6xDwrQGKVt06rdNR+unGU= Headers/opensslconf-armv7.h hash - RUtKEytWAQ250/iNbJ5hs6iXnKY= + K17TNpd3ba1hmUD57gHJLhC4tkA= hash2 - dv7a0uqZKAKVveuzUp9Qy7yWtlF1xszDtWVUi51pa5w= + K+PSTG2CvtR0tl0i4Oo5CLrPVrjgNJa4c5Uf9sw+4d0= Headers/opensslconf-armv7s.h hash - RUtKEytWAQ250/iNbJ5hs6iXnKY= + K17TNpd3ba1hmUD57gHJLhC4tkA= hash2 - dv7a0uqZKAKVveuzUp9Qy7yWtlF1xszDtWVUi51pa5w= + K+PSTG2CvtR0tl0i4Oo5CLrPVrjgNJa4c5Uf9sw+4d0= Headers/opensslconf-i386.h diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Headers/opensslconf-arm64.h b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Headers/opensslconf-arm64.h index 617debda..baa2f43f 100644 --- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Headers/opensslconf-arm64.h +++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Headers/opensslconf-arm64.h @@ -205,7 +205,10 @@ extern "C" { # undef THIRTY_TWO_BIT #endif +#if !defined(RC4_INT) #define RC4_INT unsigned char +#endif + #ifdef __cplusplus } diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/OpenSSL b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/OpenSSL index f99feece85ff37e451caea678e29dc25ad29319b..d2a6af912834df3918d2bf88343cb40c84129f42 100755 GIT binary patch delta 710 zcmajbO-R!L7{_s3&9+ikI-Q%T)6|^vZML-1mgzFLshecbyQV>Ny%J_dYC?}sn2-eO z9}z{ErkPn;_P+=|tR`bp>Y;;&X^AdVFb{=|$eMH#gbv@s@Al(UW3_N<)&dXUz$VxX zT=0Y~zym&Pg>B#k-rxfQ*bY0u7yLj7{ty5n2m~=mAP9CsFoZxTNFfZuVOM9wDCe%? zK4&z-U8K7xce`26XtZ6z)8&>Lua{*OFo_O*+q$J;LZfE-1ad^g=1jslv(6jOk&yvhV*Vr zkW3?u#6B(GGE|bhy8Ng8xy{)1L_Sw1N)9fX7q5ip-RNg$F36-j=`)QgidX;5b&iV&TgLk4cX@2@h`u^t9rOn5D;tZ;ru98B!iom5Yj(fH D8)`$f delta 710 zcmajbTS$`u7{>9OO}C{^>(fl<`Z6u2nL0JCJkH~EZiCE22eauiAxhMWBGl2_Tag5L zGm#Q44`X%FF4|0#UJW(WpcAB$R*D&d1`*mKvyH9qK7GS^=ykIMM!#3~%Ul4&Gh+#Xhumk*IXIsDsCob?h zXC%OueRtW~ZQ+ar4g2tNPnKvhW6Ndw@JZFZHBYV=PpO3Z*I$BuFlW0THRQ(|?kqdM z>6-D3V|1cXw2aRMy$EH}ni@^F^Pg47ZYYIOnw7}YvBf6K6Hf`lWiIu-Qq?~-yED?n zZxwl;hQD$YZTd+c$u;)ed|9nX)G?l{4S8HGE1N4?eSdgJXwLdRbMt)eSn&mYvrwJX z+3zcnvyI&Y2L1%YeOo^sF2AL$O)ODZH(Un)*}J7z8Ox&9GF>WRd2IO^rKITd=<&*$ zQ_?==3Bi&=R~*^U52=I1SuFP1ZfXaDAHb}Fr;v#2qY;| zBvKSoG}1n#7^GOF{YVFp4kE=N#UmvkB_bsuB_qj@Qjk)S(vZ@TGLSNnYU}P zxy-{9iO{8$>8&cvoBGM0Mn$`+MQ?Re{~z392Tx^Vasn2l;=){`lQgVrDEc?M+z=uY z9KF9-{Z6OLs7&bmb4bl&W3&+k^7-EQiwmpG#&&!VSoK^kEr>cY;c9h^_8wgQXZ;sx C)H|mD diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/opensslconf-arm64.h b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/opensslconf-arm64.h index 617debda..baa2f43f 100644 --- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/opensslconf-arm64.h +++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/opensslconf-arm64.h @@ -205,7 +205,10 @@ extern "C" { # undef THIRTY_TWO_BIT #endif +#if !defined(RC4_INT) #define RC4_INT unsigned char +#endif + #ifdef __cplusplus } diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/OpenSSL b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/OpenSSL index f99feece85ff37e451caea678e29dc25ad29319b..d2a6af912834df3918d2bf88343cb40c84129f42 100755 GIT binary patch delta 710 zcmajbO-R!L7{_s3&9+ikI-Q%T)6|^vZML-1mgzFLshecbyQV>Ny%J_dYC?}sn2-eO z9}z{ErkPn;_P+=|tR`bp>Y;;&X^AdVFb{=|$eMH#gbv@s@Al(UW3_N<)&dXUz$VxX zT=0Y~zym&Pg>B#k-rxfQ*bY0u7yLj7{ty5n2m~=mAP9CsFoZxTNFfZuVOM9wDCe%? zK4&z-U8K7xce`26XtZ6z)8&>Lua{*OFo_O*+q$J;LZfE-1ad^g=1jslv(6jOk&yvhV*Vr zkW3?u#6B(GGE|bhy8Ng8xy{)1L_Sw1N)9fX7q5ip-RNg$F36-j=`)QgidX;5b&iV&TgLk4cX@2@h`u^t9rOn5D;tZ;ru98B!iom5Yj(fH D8)`$f delta 710 zcmajbTS$`u7{>9OO}C{^>(fl<`Z6u2nL0JCJkH~EZiCE22eauiAxhMWBGl2_Tag5L zGm#Q44`X%FF4|0#UJW(WpcAB$R*D&d1`*mKvyH9qK7GS^=ykIMM!#3~%Ul4&Gh+#Xhumk*IXIsDsCob?h zXC%OueRtW~ZQ+ar4g2tNPnKvhW6Ndw@JZFZHBYV=PpO3Z*I$BuFlW0THRQ(|?kqdM z>6-D3V|1cXw2aRMy$EH}ni@^F^Pg47ZYYIOnw7}YvBf6K6Hf`lWiIu-Qq?~-yED?n zZxwl;hQD$YZTd+c$u;)ed|9nX)G?l{4S8HGE1N4?eSdgJXwLdRbMt)eSn&mYvrwJX z+3zcnvyI&Y2L1%YeOo^sF2AL$O)ODZH(Un)*}J7z8Ox&9GF>WRd2IO^rKITd=<&*$ zQ_?==3Bi&=R~*^U52=I1SuFP1ZfXaDAHb}Fr;v#2qY;| zBvKSoG}1n#7^GOF{YVFp4kE=N#UmvkB_bsuB_qj@Qjk)S(vZ@TGLSNnYU}P zxy-{9iO{8$>8&cvoBGM0Mn$`+MQ?Re{~z392Tx^Vasn2l;=){`lQgVrDEc?M+z=uY z9KF9-{Z6OLs7&bmb4bl&W3&+k^7-EQiwmpG#&&!VSoK^kEr>cY;c9h^_8wgQXZ;sx C)H|mD diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/_CodeSignature/CodeResources b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/_CodeSignature/CodeResources index 2525c569..823e05ed 100644 --- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/_CodeSignature/CodeResources +++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/_CodeSignature/CodeResources @@ -675,11 +675,11 @@ hash - wLV//M8usjfBz1F5RdBtBF3NkZQ= + PMiXcUL3B/eXHpviSD/MYjVqxMM= hash2 - LXgxED1T7MBPKEW40m00/Jvsr3yFbMumt317GDrxYqM= + aQgM3eYk6ZFB6rS6NSdUBcHH15S036pxPgt8EOFoYHs= Headers/opensslconf-x86_64.h diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/Current/Headers/opensslconf-arm64.h b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/Current/Headers/opensslconf-arm64.h index 617debda..baa2f43f 100644 --- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/Current/Headers/opensslconf-arm64.h +++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/Current/Headers/opensslconf-arm64.h @@ -205,7 +205,10 @@ extern "C" { # undef THIRTY_TWO_BIT #endif +#if !defined(RC4_INT) #define RC4_INT unsigned char +#endif + #ifdef __cplusplus } diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/Current/OpenSSL b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/Current/OpenSSL index f99feece85ff37e451caea678e29dc25ad29319b..d2a6af912834df3918d2bf88343cb40c84129f42 100755 GIT binary patch delta 710 zcmajbO-R!L7{_s3&9+ikI-Q%T)6|^vZML-1mgzFLshecbyQV>Ny%J_dYC?}sn2-eO z9}z{ErkPn;_P+=|tR`bp>Y;;&X^AdVFb{=|$eMH#gbv@s@Al(UW3_N<)&dXUz$VxX zT=0Y~zym&Pg>B#k-rxfQ*bY0u7yLj7{ty5n2m~=mAP9CsFoZxTNFfZuVOM9wDCe%? zK4&z-U8K7xce`26XtZ6z)8&>Lua{*OFo_O*+q$J;LZfE-1ad^g=1jslv(6jOk&yvhV*Vr zkW3?u#6B(GGE|bhy8Ng8xy{)1L_Sw1N)9fX7q5ip-RNg$F36-j=`)QgidX;5b&iV&TgLk4cX@2@h`u^t9rOn5D;tZ;ru98B!iom5Yj(fH D8)`$f delta 710 zcmajbTS$`u7{>9OO}C{^>(fl<`Z6u2nL0JCJkH~EZiCE22eauiAxhMWBGl2_Tag5L zGm#Q44`X%FF4|0#UJW(WpcAB$R*D&d1`*mKvyH9qK7GS^=ykIMM!#3~%Ul4&Gh+#Xhumk*IXIsDsCob?h zXC%OueRtW~ZQ+ar4g2tNPnKvhW6Ndw@JZFZHBYV=PpO3Z*I$BuFlW0THRQ(|?kqdM z>6-D3V|1cXw2aRMy$EH}ni@^F^Pg47ZYYIOnw7}YvBf6K6Hf`lWiIu-Qq?~-yED?n zZxwl;hQD$YZTd+c$u;)ed|9nX)G?l{4S8HGE1N4?eSdgJXwLdRbMt)eSn&mYvrwJX z+3zcnvyI&Y2L1%YeOo^sF2AL$O)ODZH(Un)*}J7z8Ox&9GF>WRd2IO^rKITd=<&*$ zQ_?==3Bi&=R~*^U52=I1SuFP1ZfXaDAHb}Fr;v#2qY;| zBvKSoG}1n#7^GOF{YVFp4kE=N#UmvkB_bsuB_qj@Qjk)S(vZ@TGLSNnYU}P zxy-{9iO{8$>8&cvoBGM0Mn$`+MQ?Re{~z392Tx^Vasn2l;=){`lQgVrDEc?M+z=uY z9KF9-{Z6OLs7&bmb4bl&W3&+k^7-EQiwmpG#&&!VSoK^kEr>cY;c9h^_8wgQXZ;sx C)H|mD diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/Current/_CodeSignature/CodeResources b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/Current/_CodeSignature/CodeResources index 2525c569..823e05ed 100644 --- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/Current/_CodeSignature/CodeResources +++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/Current/_CodeSignature/CodeResources @@ -675,11 +675,11 @@ hash - wLV//M8usjfBz1F5RdBtBF3NkZQ= + PMiXcUL3B/eXHpviSD/MYjVqxMM= hash2 - LXgxED1T7MBPKEW40m00/Jvsr3yFbMumt317GDrxYqM= + aQgM3eYk6ZFB6rS6NSdUBcHH15S036pxPgt8EOFoYHs= Headers/opensslconf-x86_64.h diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/opensslconf-arm64.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/opensslconf-arm64.h index 7b8e8592..2955b9a9 100644 --- a/Frameworks/iphoneos/OpenSSL.framework/Headers/opensslconf-arm64.h +++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/opensslconf-arm64.h @@ -205,7 +205,10 @@ extern "C" { # undef THIRTY_TWO_BIT #endif +#if !defined(RC4_INT) #define RC4_INT unsigned char +#endif + #ifdef __cplusplus } diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/opensslconf-arm64e.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/opensslconf-arm64e.h index 7b8e8592..2955b9a9 100644 --- a/Frameworks/iphoneos/OpenSSL.framework/Headers/opensslconf-arm64e.h +++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/opensslconf-arm64e.h @@ -205,7 +205,10 @@ extern "C" { # undef THIRTY_TWO_BIT #endif +#if !defined(RC4_INT) #define RC4_INT unsigned char +#endif + #ifdef __cplusplus } diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/opensslconf-armv7.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/opensslconf-armv7.h index 3bc97d69..be248fa7 100644 --- a/Frameworks/iphoneos/OpenSSL.framework/Headers/opensslconf-armv7.h +++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/opensslconf-armv7.h @@ -205,7 +205,10 @@ extern "C" { # define THIRTY_TWO_BIT #endif +#if !defined(RC4_INT) #define RC4_INT unsigned char +#endif + #ifdef __cplusplus } diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/opensslconf-armv7s.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/opensslconf-armv7s.h index 3bc97d69..be248fa7 100644 --- a/Frameworks/iphoneos/OpenSSL.framework/Headers/opensslconf-armv7s.h +++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/opensslconf-armv7s.h @@ -205,7 +205,10 @@ extern "C" { # define THIRTY_TWO_BIT #endif +#if !defined(RC4_INT) #define RC4_INT unsigned char +#endif + #ifdef __cplusplus } diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/opensslconf-i386.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/opensslconf-i386.h new file mode 100644 index 00000000..01a06f7e --- /dev/null +++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/opensslconf-i386.h @@ -0,0 +1,212 @@ +/* + * WARNING: do not edit! + * Generated by Makefile from include/openssl/opensslconf.h.in + * + * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef OPENSSL_ALGORITHM_DEFINES +# error OPENSSL_ALGORITHM_DEFINES no longer supported +#endif + +/* + * OpenSSL was configured with the following options: + */ + +#ifndef OPENSSL_SYS_iOS +# define OPENSSL_SYS_iOS 1 +#endif +#ifndef OPENSSL_NO_MD2 +# define OPENSSL_NO_MD2 +#endif +#ifndef OPENSSL_NO_RC5 +# define OPENSSL_NO_RC5 +#endif +#ifndef OPENSSL_THREADS +# define OPENSSL_THREADS +#endif +#ifndef OPENSSL_RAND_SEED_OS +# define OPENSSL_RAND_SEED_OS +#endif +#ifndef OPENSSL_NO_AFALGENG +# define OPENSSL_NO_AFALGENG +#endif +#ifndef OPENSSL_NO_ASAN +# define OPENSSL_NO_ASAN +#endif +#ifndef OPENSSL_NO_ASM +# define OPENSSL_NO_ASM +#endif +#ifndef OPENSSL_NO_ASYNC +# define OPENSSL_NO_ASYNC +#endif +#ifndef OPENSSL_NO_CRYPTO_MDEBUG +# define OPENSSL_NO_CRYPTO_MDEBUG +#endif +#ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE +# define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE +#endif +#ifndef OPENSSL_NO_DEVCRYPTOENG +# define OPENSSL_NO_DEVCRYPTOENG +#endif +#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 +# define OPENSSL_NO_EC_NISTP_64_GCC_128 +#endif +#ifndef OPENSSL_NO_EGD +# define OPENSSL_NO_EGD +#endif +#ifndef OPENSSL_NO_ENGINE +# define OPENSSL_NO_ENGINE +#endif +#ifndef OPENSSL_NO_EXTERNAL_TESTS +# define OPENSSL_NO_EXTERNAL_TESTS +#endif +#ifndef OPENSSL_NO_FUZZ_AFL +# define OPENSSL_NO_FUZZ_AFL +#endif +#ifndef OPENSSL_NO_FUZZ_LIBFUZZER +# define OPENSSL_NO_FUZZ_LIBFUZZER +#endif +#ifndef OPENSSL_NO_HEARTBEATS +# define OPENSSL_NO_HEARTBEATS +#endif +#ifndef OPENSSL_NO_MSAN +# define OPENSSL_NO_MSAN +#endif +#ifndef OPENSSL_NO_SCTP +# define OPENSSL_NO_SCTP +#endif +#ifndef OPENSSL_NO_SSL_TRACE +# define OPENSSL_NO_SSL_TRACE +#endif +#ifndef OPENSSL_NO_SSL3 +# define OPENSSL_NO_SSL3 +#endif +#ifndef OPENSSL_NO_SSL3_METHOD +# define OPENSSL_NO_SSL3_METHOD +#endif +#ifndef OPENSSL_NO_UBSAN +# define OPENSSL_NO_UBSAN +#endif +#ifndef OPENSSL_NO_UNIT_TEST +# define OPENSSL_NO_UNIT_TEST +#endif +#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS +# define OPENSSL_NO_WEAK_SSL_CIPHERS +#endif +#ifndef OPENSSL_NO_DYNAMIC_ENGINE +# define OPENSSL_NO_DYNAMIC_ENGINE +#endif + + +/* + * Sometimes OPENSSSL_NO_xxx ends up with an empty file and some compilers + * don't like that. This will hopefully silence them. + */ +#define NON_EMPTY_TRANSLATION_UNIT static void *dummy = &dummy; + +/* + * Applications should use -DOPENSSL_API_COMPAT= to suppress the + * declarations of functions deprecated in or before . Otherwise, they + * still won't see them if the library has been built to disable deprecated + * functions. + */ +#ifndef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# elif defined(__SUNPRO_C) +# if (__SUNPRO_C >= 0x5130) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +#endif + +#ifndef OPENSSL_FILE +# ifdef OPENSSL_NO_FILENAMES +# define OPENSSL_FILE "" +# define OPENSSL_LINE 0 +# else +# define OPENSSL_FILE __FILE__ +# define OPENSSL_LINE __LINE__ +# endif +#endif + +#ifndef OPENSSL_MIN_API +# define OPENSSL_MIN_API 0 +#endif + +#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < OPENSSL_MIN_API +# undef OPENSSL_API_COMPAT +# define OPENSSL_API_COMPAT OPENSSL_MIN_API +#endif + +/* + * Do not deprecate things to be deprecated in version 1.2.0 before the + * OpenSSL version number matches. + */ +#if OPENSSL_VERSION_NUMBER < 0x10200000L +# define DEPRECATEDIN_1_2_0(f) f; +#elif OPENSSL_API_COMPAT < 0x10200000L +# define DEPRECATEDIN_1_2_0(f) DECLARE_DEPRECATED(f) +#else +# define DEPRECATEDIN_1_2_0(f) +#endif + +#if OPENSSL_API_COMPAT < 0x10100000L +# define DEPRECATEDIN_1_1_0(f) DECLARE_DEPRECATED(f) +#else +# define DEPRECATEDIN_1_1_0(f) +#endif + +#if OPENSSL_API_COMPAT < 0x10000000L +# define DEPRECATEDIN_1_0_0(f) DECLARE_DEPRECATED(f) +#else +# define DEPRECATEDIN_1_0_0(f) +#endif + +#if OPENSSL_API_COMPAT < 0x00908000L +# define DEPRECATEDIN_0_9_8(f) DECLARE_DEPRECATED(f) +#else +# define DEPRECATEDIN_0_9_8(f) +#endif + +/* Generate 80386 code? */ +#undef I386_ONLY + +#undef OPENSSL_UNISTD +#define OPENSSL_UNISTD + +#undef OPENSSL_EXPORT_VAR_AS_FUNCTION + +/* + * The following are cipher-specific, but are part of the public API. + */ +#if !defined(OPENSSL_SYS_UEFI) +# define BN_LLONG +/* Only one for the following should be defined */ +# undef SIXTY_FOUR_BIT_LONG +# undef SIXTY_FOUR_BIT +# define THIRTY_TWO_BIT +#endif + +#define RC4_INT unsigned int + +#ifdef __cplusplus +} +#endif diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/opensslconf-x86_64.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/opensslconf-x86_64.h new file mode 100644 index 00000000..42109240 --- /dev/null +++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/opensslconf-x86_64.h @@ -0,0 +1,212 @@ +/* + * WARNING: do not edit! + * Generated by Makefile from include/openssl/opensslconf.h.in + * + * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef OPENSSL_ALGORITHM_DEFINES +# error OPENSSL_ALGORITHM_DEFINES no longer supported +#endif + +/* + * OpenSSL was configured with the following options: + */ + +#ifndef OPENSSL_SYS_iOS +# define OPENSSL_SYS_iOS 1 +#endif +#ifndef OPENSSL_NO_MD2 +# define OPENSSL_NO_MD2 +#endif +#ifndef OPENSSL_NO_RC5 +# define OPENSSL_NO_RC5 +#endif +#ifndef OPENSSL_THREADS +# define OPENSSL_THREADS +#endif +#ifndef OPENSSL_RAND_SEED_OS +# define OPENSSL_RAND_SEED_OS +#endif +#ifndef OPENSSL_NO_AFALGENG +# define OPENSSL_NO_AFALGENG +#endif +#ifndef OPENSSL_NO_ASAN +# define OPENSSL_NO_ASAN +#endif +#ifndef OPENSSL_NO_ASM +# define OPENSSL_NO_ASM +#endif +#ifndef OPENSSL_NO_ASYNC +# define OPENSSL_NO_ASYNC +#endif +#ifndef OPENSSL_NO_CRYPTO_MDEBUG +# define OPENSSL_NO_CRYPTO_MDEBUG +#endif +#ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE +# define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE +#endif +#ifndef OPENSSL_NO_DEVCRYPTOENG +# define OPENSSL_NO_DEVCRYPTOENG +#endif +#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 +# define OPENSSL_NO_EC_NISTP_64_GCC_128 +#endif +#ifndef OPENSSL_NO_EGD +# define OPENSSL_NO_EGD +#endif +#ifndef OPENSSL_NO_ENGINE +# define OPENSSL_NO_ENGINE +#endif +#ifndef OPENSSL_NO_EXTERNAL_TESTS +# define OPENSSL_NO_EXTERNAL_TESTS +#endif +#ifndef OPENSSL_NO_FUZZ_AFL +# define OPENSSL_NO_FUZZ_AFL +#endif +#ifndef OPENSSL_NO_FUZZ_LIBFUZZER +# define OPENSSL_NO_FUZZ_LIBFUZZER +#endif +#ifndef OPENSSL_NO_HEARTBEATS +# define OPENSSL_NO_HEARTBEATS +#endif +#ifndef OPENSSL_NO_MSAN +# define OPENSSL_NO_MSAN +#endif +#ifndef OPENSSL_NO_SCTP +# define OPENSSL_NO_SCTP +#endif +#ifndef OPENSSL_NO_SSL_TRACE +# define OPENSSL_NO_SSL_TRACE +#endif +#ifndef OPENSSL_NO_SSL3 +# define OPENSSL_NO_SSL3 +#endif +#ifndef OPENSSL_NO_SSL3_METHOD +# define OPENSSL_NO_SSL3_METHOD +#endif +#ifndef OPENSSL_NO_UBSAN +# define OPENSSL_NO_UBSAN +#endif +#ifndef OPENSSL_NO_UNIT_TEST +# define OPENSSL_NO_UNIT_TEST +#endif +#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS +# define OPENSSL_NO_WEAK_SSL_CIPHERS +#endif +#ifndef OPENSSL_NO_DYNAMIC_ENGINE +# define OPENSSL_NO_DYNAMIC_ENGINE +#endif + + +/* + * Sometimes OPENSSSL_NO_xxx ends up with an empty file and some compilers + * don't like that. This will hopefully silence them. + */ +#define NON_EMPTY_TRANSLATION_UNIT static void *dummy = &dummy; + +/* + * Applications should use -DOPENSSL_API_COMPAT= to suppress the + * declarations of functions deprecated in or before . Otherwise, they + * still won't see them if the library has been built to disable deprecated + * functions. + */ +#ifndef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# elif defined(__SUNPRO_C) +# if (__SUNPRO_C >= 0x5130) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +#endif + +#ifndef OPENSSL_FILE +# ifdef OPENSSL_NO_FILENAMES +# define OPENSSL_FILE "" +# define OPENSSL_LINE 0 +# else +# define OPENSSL_FILE __FILE__ +# define OPENSSL_LINE __LINE__ +# endif +#endif + +#ifndef OPENSSL_MIN_API +# define OPENSSL_MIN_API 0 +#endif + +#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < OPENSSL_MIN_API +# undef OPENSSL_API_COMPAT +# define OPENSSL_API_COMPAT OPENSSL_MIN_API +#endif + +/* + * Do not deprecate things to be deprecated in version 1.2.0 before the + * OpenSSL version number matches. + */ +#if OPENSSL_VERSION_NUMBER < 0x10200000L +# define DEPRECATEDIN_1_2_0(f) f; +#elif OPENSSL_API_COMPAT < 0x10200000L +# define DEPRECATEDIN_1_2_0(f) DECLARE_DEPRECATED(f) +#else +# define DEPRECATEDIN_1_2_0(f) +#endif + +#if OPENSSL_API_COMPAT < 0x10100000L +# define DEPRECATEDIN_1_1_0(f) DECLARE_DEPRECATED(f) +#else +# define DEPRECATEDIN_1_1_0(f) +#endif + +#if OPENSSL_API_COMPAT < 0x10000000L +# define DEPRECATEDIN_1_0_0(f) DECLARE_DEPRECATED(f) +#else +# define DEPRECATEDIN_1_0_0(f) +#endif + +#if OPENSSL_API_COMPAT < 0x00908000L +# define DEPRECATEDIN_0_9_8(f) DECLARE_DEPRECATED(f) +#else +# define DEPRECATEDIN_0_9_8(f) +#endif + +/* Generate 80386 code? */ +#undef I386_ONLY + +#undef OPENSSL_UNISTD +#define OPENSSL_UNISTD + +#undef OPENSSL_EXPORT_VAR_AS_FUNCTION + +/* + * The following are cipher-specific, but are part of the public API. + */ +#if !defined(OPENSSL_SYS_UEFI) +# undef BN_LLONG +/* Only one for the following should be defined */ +# define SIXTY_FOUR_BIT_LONG +# undef SIXTY_FOUR_BIT +# undef THIRTY_TWO_BIT +#endif + +#define RC4_INT unsigned int + +#ifdef __cplusplus +} +#endif diff --git a/Frameworks/iphoneos/OpenSSL.framework/OpenSSL b/Frameworks/iphoneos/OpenSSL.framework/OpenSSL index 8216bf486969ebd6815bd574d7caa7796488183d..0bbc962b1c6a28e720ed866c192a218c7f348b6f 100755 GIT binary patch delta 319 zcmZwCJ4-?V0ES^YWtmoX)ygtYcQr4kyVWVp&LRj65wt}@dqcJgejvEZap(txvv4;5 zMT7sQ*Tt#fS>EaUI^S)hgSy6KXj~KWX;M@2Ygz#XHKSS0DWrKVXi-aA){4T4XjN-k z??r!1qhU3>W)vIP^txv3)$@ORy}vwL`I_4w#2(#9#d#W~CJ9@J!^Adru!}wH;{b<9 zAc+)?kVXbs-+`z^y?!5k>(5epSm+d0%QNn{)ww=$=XzxE4 LhUv}ytvIDWV~dWn delta 319 zcmZwCIZgrr0EOW=Zipyuh=3xapdcZg9Dq=p zOvf!OxQ#yzmBrWm)qB1Ex6#9=W@KnqbDGzJ7Uj{Byjqq|D_WIbYg*TaHnpXIwiVQl zLJI#x2BuL=bcbdHyV!GwX0+jYGKJcEtNGD(M&szK6Rg_xY3h=&j~GlG;1F>naD-zd zk-`bmIK>&xae)jjafK{$$m1F}DBu=%xW@x5Jfi51#!p{wllc|v86}kQ;#MrX3a1ApW~iX8ow;Px^eISC7a)sR9$rQ4YJy? z`U<0%*yPGftqP^@)owC}> zI8({L6P2qPOA;IJy91q@l)W+G3uBuD(>4cY13!?{jry4H@DXsj^E~EHSe?Gzb3XG9 zMh(IGb63PJA6Ril?&Y)!qf`FHJ3>~-aL;}9Qb#2C(JRe;YbNKWK5A^3JY91kGhq*H zKev$i0F%RW#>?rc%l-a-EB|E9W4_gPZGCOCc(mJ1kEdU@oY}tQ((Pj}n{4N}J+PiR fNw?bga^6e32K!(8e~CvvOuVq*$$}ps-?{++lJ+R` delta 638 zcmdmRjei3WSsY_>Qr&EIOoo%AG&HZ&D9hh_a@_f?$ehHcVBTj(bLj>ZL{2E2S$f^ zJAb@>IqfmWq-^~w)z_EtvzgBGddvIoT0-yYf{2+eZDFg!_*l)wBFt7VW1iB+@H{aq ztIe5drOFk9PmiXl?Y*>l-jzikfd1OW18R(VeT^AV{6(*Fu?(Ausz`bQ9>rS!eO$)p> zba9IdgnwRm-|WrX$}9hX&P~eRnDB+M&4Fo~1G9l2$mvFX%y;+*INf<3^CzrM-|jh| zc?YA0br-kO4QKBw`O%%i6Bq0?|Ep#desHnpX5sYc4cETqbICk9&+H&8vwFJbLT17q z+J0^!^8qG@lPlKt1(_GwU!G|C^`=TvVA7W~EB7$@Nkw(sRSoV^Mh>_B%G4aN(!MJ` eW9A91gvMkpiGXI&kB>d?D;Bi0jnTmjx$^U diff --git a/Frameworks/iphonesimulator/OpenSSL.framework/_CodeSignature/CodeResources b/Frameworks/iphonesimulator/OpenSSL.framework/_CodeSignature/CodeResources index c146b5df..f1a60763 100644 --- a/Frameworks/iphonesimulator/OpenSSL.framework/_CodeSignature/CodeResources +++ b/Frameworks/iphonesimulator/OpenSSL.framework/_CodeSignature/CodeResources @@ -246,19 +246,19 @@ Headers/opensslconf-arm64.h - rQ63UQXkdQJaEMcIP0AkuDjVt0I= + bANfjjQphQdSV8v5cxoKMD25BJU= Headers/opensslconf-arm64e.h - rQ63UQXkdQJaEMcIP0AkuDjVt0I= + bANfjjQphQdSV8v5cxoKMD25BJU= Headers/opensslconf-armv7.h - RUtKEytWAQ250/iNbJ5hs6iXnKY= + K17TNpd3ba1hmUD57gHJLhC4tkA= Headers/opensslconf-armv7s.h - RUtKEytWAQ250/iNbJ5hs6iXnKY= + K17TNpd3ba1hmUD57gHJLhC4tkA= Headers/opensslconf-i386.h @@ -1123,44 +1123,44 @@ hash - rQ63UQXkdQJaEMcIP0AkuDjVt0I= + bANfjjQphQdSV8v5cxoKMD25BJU= hash2 - bHBRXVtoqdJn2RZmQmW7Ot9lNHksh6O5z0XV7KLVC9E= + IYBWed9nlMdO53oLf0K5SA6xDwrQGKVt06rdNR+unGU= Headers/opensslconf-arm64e.h hash - rQ63UQXkdQJaEMcIP0AkuDjVt0I= + bANfjjQphQdSV8v5cxoKMD25BJU= hash2 - bHBRXVtoqdJn2RZmQmW7Ot9lNHksh6O5z0XV7KLVC9E= + IYBWed9nlMdO53oLf0K5SA6xDwrQGKVt06rdNR+unGU= Headers/opensslconf-armv7.h hash - RUtKEytWAQ250/iNbJ5hs6iXnKY= + K17TNpd3ba1hmUD57gHJLhC4tkA= hash2 - dv7a0uqZKAKVveuzUp9Qy7yWtlF1xszDtWVUi51pa5w= + K+PSTG2CvtR0tl0i4Oo5CLrPVrjgNJa4c5Uf9sw+4d0= Headers/opensslconf-armv7s.h hash - RUtKEytWAQ250/iNbJ5hs6iXnKY= + K17TNpd3ba1hmUD57gHJLhC4tkA= hash2 - dv7a0uqZKAKVveuzUp9Qy7yWtlF1xszDtWVUi51pa5w= + K+PSTG2CvtR0tl0i4Oo5CLrPVrjgNJa4c5Uf9sw+4d0= Headers/opensslconf-i386.h diff --git a/Frameworks/macos/OpenSSL.framework/Headers/opensslconf-arm64.h b/Frameworks/macos/OpenSSL.framework/Headers/opensslconf-arm64.h index 617debda..baa2f43f 100644 --- a/Frameworks/macos/OpenSSL.framework/Headers/opensslconf-arm64.h +++ b/Frameworks/macos/OpenSSL.framework/Headers/opensslconf-arm64.h @@ -205,7 +205,10 @@ extern "C" { # undef THIRTY_TWO_BIT #endif +#if !defined(RC4_INT) #define RC4_INT unsigned char +#endif + #ifdef __cplusplus } diff --git a/Frameworks/macos/OpenSSL.framework/OpenSSL b/Frameworks/macos/OpenSSL.framework/OpenSSL index f99feece85ff37e451caea678e29dc25ad29319b..d2a6af912834df3918d2bf88343cb40c84129f42 100755 GIT binary patch delta 710 zcmajbO-R!L7{_s3&9+ikI-Q%T)6|^vZML-1mgzFLshecbyQV>Ny%J_dYC?}sn2-eO z9}z{ErkPn;_P+=|tR`bp>Y;;&X^AdVFb{=|$eMH#gbv@s@Al(UW3_N<)&dXUz$VxX zT=0Y~zym&Pg>B#k-rxfQ*bY0u7yLj7{ty5n2m~=mAP9CsFoZxTNFfZuVOM9wDCe%? zK4&z-U8K7xce`26XtZ6z)8&>Lua{*OFo_O*+q$J;LZfE-1ad^g=1jslv(6jOk&yvhV*Vr zkW3?u#6B(GGE|bhy8Ng8xy{)1L_Sw1N)9fX7q5ip-RNg$F36-j=`)QgidX;5b&iV&TgLk4cX@2@h`u^t9rOn5D;tZ;ru98B!iom5Yj(fH D8)`$f delta 710 zcmajbTS$`u7{>9OO}C{^>(fl<`Z6u2nL0JCJkH~EZiCE22eauiAxhMWBGl2_Tag5L zGm#Q44`X%FF4|0#UJW(WpcAB$R*D&d1`*mKvyH9qK7GS^=ykIMM!#3~%Ul4&Gh+#Xhumk*IXIsDsCob?h zXC%OueRtW~ZQ+ar4g2tNPnKvhW6Ndw@JZFZHBYV=PpO3Z*I$BuFlW0THRQ(|?kqdM z>6-D3V|1cXw2aRMy$EH}ni@^F^Pg47ZYYIOnw7}YvBf6K6Hf`lWiIu-Qq?~-yED?n zZxwl;hQD$YZTd+c$u;)ed|9nX)G?l{4S8HGE1N4?eSdgJXwLdRbMt)eSn&mYvrwJX z+3zcnvyI&Y2L1%YeOo^sF2AL$O)ODZH(Un)*}J7z8Ox&9GF>WRd2IO^rKITd=<&*$ zQ_?==3Bi&=R~*^U52=I1SuFP1ZfXaDAHb}Fr;v#2qY;| zBvKSoG}1n#7^GOF{YVFp4kE=N#UmvkB_bsuB_qj@Qjk)S(vZ@TGLSNnYU}P zxy-{9iO{8$>8&cvoBGM0Mn$`+MQ?Re{~z392Tx^Vasn2l;=){`lQgVrDEc?M+z=uY z9KF9-{Z6OLs7&bmb4bl&W3&+k^7-EQiwmpG#&&!VSoK^kEr>cY;c9h^_8wgQXZ;sx C)H|mD diff --git a/Frameworks/macos/OpenSSL.framework/Versions/A/Headers/opensslconf-arm64.h b/Frameworks/macos/OpenSSL.framework/Versions/A/Headers/opensslconf-arm64.h index 617debda..baa2f43f 100644 --- a/Frameworks/macos/OpenSSL.framework/Versions/A/Headers/opensslconf-arm64.h +++ b/Frameworks/macos/OpenSSL.framework/Versions/A/Headers/opensslconf-arm64.h @@ -205,7 +205,10 @@ extern "C" { # undef THIRTY_TWO_BIT #endif +#if !defined(RC4_INT) #define RC4_INT unsigned char +#endif + #ifdef __cplusplus } diff --git a/Frameworks/macos/OpenSSL.framework/Versions/A/OpenSSL b/Frameworks/macos/OpenSSL.framework/Versions/A/OpenSSL index f99feece85ff37e451caea678e29dc25ad29319b..d2a6af912834df3918d2bf88343cb40c84129f42 100755 GIT binary patch delta 710 zcmajbO-R!L7{_s3&9+ikI-Q%T)6|^vZML-1mgzFLshecbyQV>Ny%J_dYC?}sn2-eO z9}z{ErkPn;_P+=|tR`bp>Y;;&X^AdVFb{=|$eMH#gbv@s@Al(UW3_N<)&dXUz$VxX zT=0Y~zym&Pg>B#k-rxfQ*bY0u7yLj7{ty5n2m~=mAP9CsFoZxTNFfZuVOM9wDCe%? zK4&z-U8K7xce`26XtZ6z)8&>Lua{*OFo_O*+q$J;LZfE-1ad^g=1jslv(6jOk&yvhV*Vr zkW3?u#6B(GGE|bhy8Ng8xy{)1L_Sw1N)9fX7q5ip-RNg$F36-j=`)QgidX;5b&iV&TgLk4cX@2@h`u^t9rOn5D;tZ;ru98B!iom5Yj(fH D8)`$f delta 710 zcmajbTS$`u7{>9OO}C{^>(fl<`Z6u2nL0JCJkH~EZiCE22eauiAxhMWBGl2_Tag5L zGm#Q44`X%FF4|0#UJW(WpcAB$R*D&d1`*mKvyH9qK7GS^=ykIMM!#3~%Ul4&Gh+#Xhumk*IXIsDsCob?h zXC%OueRtW~ZQ+ar4g2tNPnKvhW6Ndw@JZFZHBYV=PpO3Z*I$BuFlW0THRQ(|?kqdM z>6-D3V|1cXw2aRMy$EH}ni@^F^Pg47ZYYIOnw7}YvBf6K6Hf`lWiIu-Qq?~-yED?n zZxwl;hQD$YZTd+c$u;)ed|9nX)G?l{4S8HGE1N4?eSdgJXwLdRbMt)eSn&mYvrwJX z+3zcnvyI&Y2L1%YeOo^sF2AL$O)ODZH(Un)*}J7z8Ox&9GF>WRd2IO^rKITd=<&*$ zQ_?==3Bi&=R~*^U52=I1SuFP1ZfXaDAHb}Fr;v#2qY;| zBvKSoG}1n#7^GOF{YVFp4kE=N#UmvkB_bsuB_qj@Qjk)S(vZ@TGLSNnYU}P zxy-{9iO{8$>8&cvoBGM0Mn$`+MQ?Re{~z392Tx^Vasn2l;=){`lQgVrDEc?M+z=uY z9KF9-{Z6OLs7&bmb4bl&W3&+k^7-EQiwmpG#&&!VSoK^kEr>cY;c9h^_8wgQXZ;sx C)H|mD diff --git a/Frameworks/macos/OpenSSL.framework/Versions/A/_CodeSignature/CodeResources b/Frameworks/macos/OpenSSL.framework/Versions/A/_CodeSignature/CodeResources index 2525c569..823e05ed 100644 --- a/Frameworks/macos/OpenSSL.framework/Versions/A/_CodeSignature/CodeResources +++ b/Frameworks/macos/OpenSSL.framework/Versions/A/_CodeSignature/CodeResources @@ -675,11 +675,11 @@ hash - wLV//M8usjfBz1F5RdBtBF3NkZQ= + PMiXcUL3B/eXHpviSD/MYjVqxMM= hash2 - LXgxED1T7MBPKEW40m00/Jvsr3yFbMumt317GDrxYqM= + aQgM3eYk6ZFB6rS6NSdUBcHH15S036pxPgt8EOFoYHs= Headers/opensslconf-x86_64.h diff --git a/Frameworks/macos/OpenSSL.framework/Versions/Current/Headers/opensslconf-arm64.h b/Frameworks/macos/OpenSSL.framework/Versions/Current/Headers/opensslconf-arm64.h index 617debda..baa2f43f 100644 --- a/Frameworks/macos/OpenSSL.framework/Versions/Current/Headers/opensslconf-arm64.h +++ b/Frameworks/macos/OpenSSL.framework/Versions/Current/Headers/opensslconf-arm64.h @@ -205,7 +205,10 @@ extern "C" { # undef THIRTY_TWO_BIT #endif +#if !defined(RC4_INT) #define RC4_INT unsigned char +#endif + #ifdef __cplusplus } diff --git a/Frameworks/macos/OpenSSL.framework/Versions/Current/OpenSSL b/Frameworks/macos/OpenSSL.framework/Versions/Current/OpenSSL index f99feece85ff37e451caea678e29dc25ad29319b..d2a6af912834df3918d2bf88343cb40c84129f42 100755 GIT binary patch delta 710 zcmajbO-R!L7{_s3&9+ikI-Q%T)6|^vZML-1mgzFLshecbyQV>Ny%J_dYC?}sn2-eO z9}z{ErkPn;_P+=|tR`bp>Y;;&X^AdVFb{=|$eMH#gbv@s@Al(UW3_N<)&dXUz$VxX zT=0Y~zym&Pg>B#k-rxfQ*bY0u7yLj7{ty5n2m~=mAP9CsFoZxTNFfZuVOM9wDCe%? zK4&z-U8K7xce`26XtZ6z)8&>Lua{*OFo_O*+q$J;LZfE-1ad^g=1jslv(6jOk&yvhV*Vr zkW3?u#6B(GGE|bhy8Ng8xy{)1L_Sw1N)9fX7q5ip-RNg$F36-j=`)QgidX;5b&iV&TgLk4cX@2@h`u^t9rOn5D;tZ;ru98B!iom5Yj(fH D8)`$f delta 710 zcmajbTS$`u7{>9OO}C{^>(fl<`Z6u2nL0JCJkH~EZiCE22eauiAxhMWBGl2_Tag5L zGm#Q44`X%FF4|0#UJW(WpcAB$R*D&d1`*mKvyH9qK7GS^=ykIMM!#3~%Ul4&Gh+#Xhumk*IXIsDsCob?h zXC%OueRtW~ZQ+ar4g2tNPnKvhW6Ndw@JZFZHBYV=PpO3Z*I$BuFlW0THRQ(|?kqdM z>6-D3V|1cXw2aRMy$EH}ni@^F^Pg47ZYYIOnw7}YvBf6K6Hf`lWiIu-Qq?~-yED?n zZxwl;hQD$YZTd+c$u;)ed|9nX)G?l{4S8HGE1N4?eSdgJXwLdRbMt)eSn&mYvrwJX z+3zcnvyI&Y2L1%YeOo^sF2AL$O)ODZH(Un)*}J7z8Ox&9GF>WRd2IO^rKITd=<&*$ zQ_?==3Bi&=R~*^U52=I1SuFP1ZfXaDAHb}Fr;v#2qY;| zBvKSoG}1n#7^GOF{YVFp4kE=N#UmvkB_bsuB_qj@Qjk)S(vZ@TGLSNnYU}P zxy-{9iO{8$>8&cvoBGM0Mn$`+MQ?Re{~z392Tx^Vasn2l;=){`lQgVrDEc?M+z=uY z9KF9-{Z6OLs7&bmb4bl&W3&+k^7-EQiwmpG#&&!VSoK^kEr>cY;c9h^_8wgQXZ;sx C)H|mD diff --git a/Frameworks/macos/OpenSSL.framework/Versions/Current/_CodeSignature/CodeResources b/Frameworks/macos/OpenSSL.framework/Versions/Current/_CodeSignature/CodeResources index 2525c569..823e05ed 100644 --- a/Frameworks/macos/OpenSSL.framework/Versions/Current/_CodeSignature/CodeResources +++ b/Frameworks/macos/OpenSSL.framework/Versions/Current/_CodeSignature/CodeResources @@ -675,11 +675,11 @@ hash - wLV//M8usjfBz1F5RdBtBF3NkZQ= + PMiXcUL3B/eXHpviSD/MYjVqxMM= hash2 - LXgxED1T7MBPKEW40m00/Jvsr3yFbMumt317GDrxYqM= + aQgM3eYk6ZFB6rS6NSdUBcHH15S036pxPgt8EOFoYHs= Headers/opensslconf-x86_64.h diff --git a/OpenSSL.xcodeproj/project.pbxproj b/OpenSSL.xcodeproj/project.pbxproj index 3bb9c97f..c7d1a19f 100644 --- a/OpenSSL.xcodeproj/project.pbxproj +++ b/OpenSSL.xcodeproj/project.pbxproj @@ -336,8 +336,8 @@ 7594BE0C252683D8006D0FC0 /* opensslconf-arm64.h in Headers */ = {isa = PBXBuildFile; fileRef = 7594BE0B252683D8006D0FC0 /* opensslconf-arm64.h */; settings = {ATTRIBUTES = (Public, ); }; }; 75F170CE25675C9700E7EECB /* opensslconf-i386.h in Headers */ = {isa = PBXBuildFile; fileRef = 7538B9D124D1F06D007C13A2 /* opensslconf-i386.h */; settings = {ATTRIBUTES = (Public, ); }; }; 75F170D525675C9D00E7EECB /* opensslconf-x86_64.h in Headers */ = {isa = PBXBuildFile; fileRef = 7538B9D624D1F06E007C13A2 /* opensslconf-x86_64.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 75F170DC25675CAE00E7EECB /* opensslconf-i386.h in Headers */ = {isa = PBXBuildFile; fileRef = 7538B9D124D1F06D007C13A2 /* opensslconf-i386.h */; }; - 75F170E025675CB100E7EECB /* opensslconf-x86_64.h in Headers */ = {isa = PBXBuildFile; fileRef = 7538B9D624D1F06E007C13A2 /* opensslconf-x86_64.h */; }; + 75F170DC25675CAE00E7EECB /* opensslconf-i386.h in Headers */ = {isa = PBXBuildFile; fileRef = 7538B9D124D1F06D007C13A2 /* opensslconf-i386.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 75F170E025675CB100E7EECB /* opensslconf-x86_64.h in Headers */ = {isa = PBXBuildFile; fileRef = 7538B9D624D1F06E007C13A2 /* opensslconf-x86_64.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9F4A2707223BD900005CB63A /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F4A2705223BD900005CB63A /* libssl.a */; platformFilter = ios; }; 9F4A2708223BD900005CB63A /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F4A2706223BD900005CB63A /* libcrypto.a */; platformFilter = ios; }; 9F4A27BE223BE57C005CB63A /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F4A27BC223BE57C005CB63A /* libcrypto.a */; }; diff --git a/iphoneos/include/openssl/opensslconf-arm64.h b/iphoneos/include/openssl/opensslconf-arm64.h index 7b8e8592..2955b9a9 100644 --- a/iphoneos/include/openssl/opensslconf-arm64.h +++ b/iphoneos/include/openssl/opensslconf-arm64.h @@ -205,7 +205,10 @@ extern "C" { # undef THIRTY_TWO_BIT #endif +#if !defined(RC4_INT) #define RC4_INT unsigned char +#endif + #ifdef __cplusplus } diff --git a/iphoneos/include/openssl/opensslconf-arm64e.h b/iphoneos/include/openssl/opensslconf-arm64e.h index 7b8e8592..2955b9a9 100644 --- a/iphoneos/include/openssl/opensslconf-arm64e.h +++ b/iphoneos/include/openssl/opensslconf-arm64e.h @@ -205,7 +205,10 @@ extern "C" { # undef THIRTY_TWO_BIT #endif +#if !defined(RC4_INT) #define RC4_INT unsigned char +#endif + #ifdef __cplusplus } diff --git a/iphoneos/include/openssl/opensslconf-armv7.h b/iphoneos/include/openssl/opensslconf-armv7.h index 3bc97d69..be248fa7 100644 --- a/iphoneos/include/openssl/opensslconf-armv7.h +++ b/iphoneos/include/openssl/opensslconf-armv7.h @@ -205,7 +205,10 @@ extern "C" { # define THIRTY_TWO_BIT #endif +#if !defined(RC4_INT) #define RC4_INT unsigned char +#endif + #ifdef __cplusplus } diff --git a/iphoneos/include/openssl/opensslconf-armv7s.h b/iphoneos/include/openssl/opensslconf-armv7s.h index 3bc97d69..be248fa7 100644 --- a/iphoneos/include/openssl/opensslconf-armv7s.h +++ b/iphoneos/include/openssl/opensslconf-armv7s.h @@ -205,7 +205,10 @@ extern "C" { # define THIRTY_TWO_BIT #endif +#if !defined(RC4_INT) #define RC4_INT unsigned char +#endif + #ifdef __cplusplus } diff --git a/iphonesimulator/include/openssl/opensslconf-arm64.h b/iphonesimulator/include/openssl/opensslconf-arm64.h index 7b8e8592..2955b9a9 100644 --- a/iphonesimulator/include/openssl/opensslconf-arm64.h +++ b/iphonesimulator/include/openssl/opensslconf-arm64.h @@ -205,7 +205,10 @@ extern "C" { # undef THIRTY_TWO_BIT #endif +#if !defined(RC4_INT) #define RC4_INT unsigned char +#endif + #ifdef __cplusplus } diff --git a/macos/include/openssl/opensslconf-arm64.h b/macos/include/openssl/opensslconf-arm64.h index 617debda..baa2f43f 100644 --- a/macos/include/openssl/opensslconf-arm64.h +++ b/macos/include/openssl/opensslconf-arm64.h @@ -205,7 +205,10 @@ extern "C" { # undef THIRTY_TWO_BIT #endif +#if !defined(RC4_INT) #define RC4_INT unsigned char +#endif + #ifdef __cplusplus } diff --git a/scripts/build.sh b/scripts/build.sh index c9a76112..6730e4a0 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -65,11 +65,7 @@ configure() { if [ "$OS" == "MacOSX" ]; then - if [ "$ARCH" == "x86_64" ]; then - ${SRC_DIR}/Configure macos-$ARCH no-asm no-shared --prefix="${PREFIX}" &> "${PREFIX}.config.log" - elif [ "$ARCH" == "arm64" ]; then - ${SRC_DIR}/Configure macos-$ARCH no-asm no-shared --prefix="${PREFIX}" &> "${PREFIX}.config.log" - fi + ${SRC_DIR}/Configure macos-$ARCH no-asm no-shared --prefix="${PREFIX}" &> "${PREFIX}.config.log" elif [ "$OS" == "iPhoneSimulator" ]; then ${SRC_DIR}/Configure ios-sim-cross-$ARCH no-asm no-shared --prefix="${PREFIX}" &> "${PREFIX}.config.log" elif [ "$OS" == "iPhoneOS" ]; then @@ -99,7 +95,7 @@ build() # fix headers for Swift - sed -ie "s/BIGNUM \*I,/BIGNUM \*i,/g" ${SRC_DIR}/crypto/rsa/rsa_local.h + sed -ie "s/BIGNUM \*I,/BIGNUM \*i,/g" ${SRC_DIR}/crypto/rsa/rsa_local.h # -bundle and -bitcode_bundle (Xcode setting ENABLE_BITCODE=YES) cannot be used together # sed -ie "s/'-bundle'/''/g" ${SRC_DIR}/Configurations/shared-info.pl @@ -122,7 +118,6 @@ build() fi mv "${PREFIX}/include/openssl/opensslconf.h" "${PREFIX}/include/openssl/opensslconf-${ARCH}.h" - rm -rf "${SRC_DIR}" } @@ -191,6 +186,10 @@ build_ios() { find "${SCRIPT_DIR}/../iphoneos/include/openssl" -type f -name "*.h" -exec sed -i "" -e "s/include /include /g" {} \; find "${SCRIPT_DIR}/../iphonesimulator/include/openssl" -type f -name "*.h" -exec sed -i "" -e "s/include /include /g" {} \; + # fix RC4_INT redefinition + find "${SCRIPT_DIR}/../iphoneos/include/openssl" -type f -name "*.h" -exec sed -i "" -e "s/\#define RC4_INT unsigned char/\#if \!defined(RC4_INT)\n#define RC4_INT unsigned char\n\#endif\n/g" {} \; + find "${SCRIPT_DIR}/../iphonesimulator/include/openssl" -type f -name "*.h" -exec sed -i "" -e "s/\#define RC4_INT unsigned char/\#if \!defined(RC4_INT)\n#define RC4_INT unsigned char\n\#endif\n/g" {} \; + cp -f ${TMP_BUILD_DIR}/${OPENSSL_VERSION}-iPhoneSimulator-x86_64/include/openssl/opensslconf-x86_64.h "${SCRIPT_DIR}/../iphonesimulator/include/openssl" cp -f ${TMP_BUILD_DIR}/${OPENSSL_VERSION}-iPhoneSimulator-i386/include/openssl/opensslconf-i386.h "${SCRIPT_DIR}/../iphonesimulator/include/openssl" cp -f ${TMP_BUILD_DIR}/${OPENSSL_VERSION}-iPhoneSimulator-arm64/include/openssl/opensslconf-arm64.h "${SCRIPT_DIR}/../iphonesimulator/include/openssl" @@ -223,6 +222,9 @@ build_macos() { # fix inttypes.h find "${SCRIPT_DIR}/../macos/include/openssl" -type f -name "*.h" -exec sed -i "" -e "s/include /include /g" {} \; + # fix RC4_INT redefinition + find "${SCRIPT_DIR}/../macos/include/openssl" -type f -name "*.h" -exec sed -i "" -e "s/\#define RC4_INT unsigned char/\#if \!defined(RC4_INT)\n#define RC4_INT unsigned char\n\#endif\n/g" {} \; + cp -f ${TMP_BUILD_DIR}/${OPENSSL_VERSION}-MacOSX-x86_64/include/openssl/opensslconf-x86_64.h "${SCRIPT_DIR}/../macos/include/openssl" cp -f ${TMP_BUILD_DIR}/${OPENSSL_VERSION}-MacOSX-arm64/include/openssl/opensslconf-arm64.h "${SCRIPT_DIR}/../macos/include/openssl"