Merge pull request #26 from dumganhar/fix/disable-async-for-ios

Disable async in openssl for ios since apple forbit developers to use the API (setcontext, getcontext, makecontext).
cocos · May 24, 2017 · 7fa906b · 7fa906b
2 parents 29794b4 + 14994c2
commit 7fa906b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 3 deletions.
diff --git a/ios/include/openssl/opensslconf-arm32.h b/ios/include/openssl/opensslconf-arm32.h
@@ -37,8 +37,8 @@ extern "C" {
 #ifndef OPENSSL_NO_ASAN
 # define OPENSSL_NO_ASAN
 #endif
-#ifndef OPENSSL_NO_ASM
-# define OPENSSL_NO_ASM
+#ifndef OPENSSL_NO_ASYNC
+# define OPENSSL_NO_ASYNC
 #endif
 #ifndef OPENSSL_NO_CRYPTO_MDEBUG
 # define OPENSSL_NO_CRYPTO_MDEBUG
@@ -147,7 +147,7 @@ extern "C" {
 # define DEPRECATEDIN_0_9_8(f)
 #endif
 
-
+#define OPENSSL_CPUID_OBJ
 
 /* Generate 80386 code? */
 #undef I386_ONLY

diff --git a/ios/include/openssl/opensslconf-arm64.h b/ios/include/openssl/opensslconf-arm64.h
@@ -37,6 +37,9 @@ extern "C" {
 #ifndef OPENSSL_NO_ASAN
 # define OPENSSL_NO_ASAN
 #endif
+#ifndef OPENSSL_NO_ASYNC
+# define OPENSSL_NO_ASYNC
+#endif
 #ifndef OPENSSL_NO_CRYPTO_MDEBUG
 # define OPENSSL_NO_CRYPTO_MDEBUG
 #endif

diff --git a/ios/include/openssl/opensslconf-i386.h b/ios/include/openssl/opensslconf-i386.h
@@ -37,6 +37,9 @@ extern "C" {
 #ifndef OPENSSL_NO_ASAN
 # define OPENSSL_NO_ASAN
 #endif
+#ifndef OPENSSL_NO_ASYNC
+# define OPENSSL_NO_ASYNC
+#endif
 #ifndef OPENSSL_NO_CRYPTO_MDEBUG
 # define OPENSSL_NO_CRYPTO_MDEBUG
 #endif

diff --git a/ios/include/openssl/opensslconf-x86_64.h b/ios/include/openssl/opensslconf-x86_64.h
@@ -37,6 +37,9 @@ extern "C" {
 #ifndef OPENSSL_NO_ASAN
 # define OPENSSL_NO_ASAN
 #endif
+#ifndef OPENSSL_NO_ASYNC
+# define OPENSSL_NO_ASYNC
+#endif
 #ifndef OPENSSL_NO_CRYPTO_MDEBUG
 # define OPENSSL_NO_CRYPTO_MDEBUG
 #endif

diff --git a/ios/libs/libcrypto.a b/ios/libs/libcrypto.a
diff --git a/ios/libs/libssl.a b/ios/libs/libssl.a