From 198efa16672d5f77d320ce3ae66542af2a8296c1 Mon Sep 17 00:00:00 2001
From: minggo <ming@cocos2d-x.org>
Date: Wed, 4 Jan 2017 18:18:09 +0800
Subject: [PATCH] adjust openssl

---
 curl/prebuilt/android/Android.mk                   |  12 ------------
 openssl/prebuilt/android/Android.mk                |  13 +++++++++++++
 .../prebuilt/android/arm64-v8a/libcrypto.a         | Bin
 .../prebuilt/android/arm64-v8a/libssl.a            | Bin
 .../prebuilt/android/armeabi-v7a/libcrypto.a       | Bin
 .../prebuilt/android/armeabi-v7a/libssl.a          | Bin
 .../prebuilt/android/armeabi/libcrypto.a           | Bin
 .../prebuilt/android/armeabi/libssl.a              | Bin
 {curl => openssl}/prebuilt/android/x86/libcrypto.a | Bin
 {curl => openssl}/prebuilt/android/x86/libssl.a    | Bin
 {curl => openssl}/prebuilt/ios/libcrypto.a         | Bin
 {curl => openssl}/prebuilt/ios/libssl.a            | Bin
 {curl => openssl}/prebuilt/mac/libcrypto.a         | Bin
 {curl => openssl}/prebuilt/mac/libssl.a            | Bin
 {curl => openssl}/prebuilt/win10/arm/libeay32.dll  | Bin
 {curl => openssl}/prebuilt/win10/arm/ssleay32.dll  | Bin
 .../prebuilt/win10/win32/libeay32.dll              | Bin
 .../prebuilt/win10/win32/ssleay32.dll              | Bin
 {curl => openssl}/prebuilt/win10/x64/libeay32.dll  | Bin
 {curl => openssl}/prebuilt/win10/x64/ssleay32.dll  | Bin
 {curl => openssl}/prebuilt/win32/libeay32.lib      | Bin
 {curl => openssl}/prebuilt/win32/ssleay32.lib      | Bin
 .../prebuilt/winrt_8.1/arm/libeay32.dll            | Bin
 .../prebuilt/winrt_8.1/arm/ssleay32.dll            | Bin
 .../prebuilt/winrt_8.1/win32/libeay32.dll          | Bin
 .../prebuilt/winrt_8.1/win32/ssleay32.dll          | Bin
 {curl => openssl}/prebuilt/wp_8.1/arm/libeay32.dll | Bin
 {curl => openssl}/prebuilt/wp_8.1/arm/libeay32.lib | Bin
 {curl => openssl}/prebuilt/wp_8.1/arm/ssleay32.dll | Bin
 {curl => openssl}/prebuilt/wp_8.1/arm/ssleay32.lib | Bin
 .../prebuilt/wp_8.1/win32/libeay32.dll             | Bin
 .../prebuilt/wp_8.1/win32/libeay32.lib             | Bin
 .../prebuilt/wp_8.1/win32/ssleay32.dll             | Bin
 .../prebuilt/wp_8.1/win32/ssleay32.lib             | Bin
 version.json                                       |   2 +-
 35 files changed, 14 insertions(+), 13 deletions(-)
 create mode 100644 openssl/prebuilt/android/Android.mk
 rename {curl => openssl}/prebuilt/android/arm64-v8a/libcrypto.a (100%)
 rename {curl => openssl}/prebuilt/android/arm64-v8a/libssl.a (100%)
 rename {curl => openssl}/prebuilt/android/armeabi-v7a/libcrypto.a (100%)
 rename {curl => openssl}/prebuilt/android/armeabi-v7a/libssl.a (100%)
 rename {curl => openssl}/prebuilt/android/armeabi/libcrypto.a (100%)
 rename {curl => openssl}/prebuilt/android/armeabi/libssl.a (100%)
 rename {curl => openssl}/prebuilt/android/x86/libcrypto.a (100%)
 rename {curl => openssl}/prebuilt/android/x86/libssl.a (100%)
 rename {curl => openssl}/prebuilt/ios/libcrypto.a (100%)
 rename {curl => openssl}/prebuilt/ios/libssl.a (100%)
 rename {curl => openssl}/prebuilt/mac/libcrypto.a (100%)
 rename {curl => openssl}/prebuilt/mac/libssl.a (100%)
 rename {curl => openssl}/prebuilt/win10/arm/libeay32.dll (100%)
 rename {curl => openssl}/prebuilt/win10/arm/ssleay32.dll (100%)
 rename {curl => openssl}/prebuilt/win10/win32/libeay32.dll (100%)
 rename {curl => openssl}/prebuilt/win10/win32/ssleay32.dll (100%)
 rename {curl => openssl}/prebuilt/win10/x64/libeay32.dll (100%)
 rename {curl => openssl}/prebuilt/win10/x64/ssleay32.dll (100%)
 rename {curl => openssl}/prebuilt/win32/libeay32.lib (100%)
 rename {curl => openssl}/prebuilt/win32/ssleay32.lib (100%)
 rename {curl => openssl}/prebuilt/winrt_8.1/arm/libeay32.dll (100%)
 rename {curl => openssl}/prebuilt/winrt_8.1/arm/ssleay32.dll (100%)
 rename {curl => openssl}/prebuilt/winrt_8.1/win32/libeay32.dll (100%)
 rename {curl => openssl}/prebuilt/winrt_8.1/win32/ssleay32.dll (100%)
 rename {curl => openssl}/prebuilt/wp_8.1/arm/libeay32.dll (100%)
 rename {curl => openssl}/prebuilt/wp_8.1/arm/libeay32.lib (100%)
 rename {curl => openssl}/prebuilt/wp_8.1/arm/ssleay32.dll (100%)
 rename {curl => openssl}/prebuilt/wp_8.1/arm/ssleay32.lib (100%)
 rename {curl => openssl}/prebuilt/wp_8.1/win32/libeay32.dll (100%)
 rename {curl => openssl}/prebuilt/wp_8.1/win32/libeay32.lib (100%)
 rename {curl => openssl}/prebuilt/wp_8.1/win32/ssleay32.dll (100%)
 rename {curl => openssl}/prebuilt/wp_8.1/win32/ssleay32.lib (100%)

diff --git a/curl/prebuilt/android/Android.mk b/curl/prebuilt/android/Android.mk
index e0a270639..3d1933ef0 100644
--- a/curl/prebuilt/android/Android.mk
+++ b/curl/prebuilt/android/Android.mk
@@ -8,15 +8,3 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android
 LOCAL_STATIC_LIBRARIES += cocos_ssl_static
 LOCAL_STATIC_LIBRARIES += cocos_crypto_static
 include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := cocos_crypto_static
-LOCAL_MODULE_FILENAME := crypto
-LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libcrypto.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-LOCAL_MODULE := cocos_ssl_static
-LOCAL_MODULE_FILENAME := ssl
-LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libssl.a
-include $(PREBUILT_STATIC_LIBRARY)
diff --git a/openssl/prebuilt/android/Android.mk b/openssl/prebuilt/android/Android.mk
new file mode 100644
index 000000000..f84aced12
--- /dev/null
+++ b/openssl/prebuilt/android/Android.mk
@@ -0,0 +1,13 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := cocos_crypto_static
+LOCAL_MODULE_FILENAME := crypto
+LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libcrypto.a
+include $(PREBUILT_STATIC_LIBRARY)
+
+LOCAL_MODULE := cocos_ssl_static
+LOCAL_MODULE_FILENAME := ssl
+LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libssl.a
+include $(PREBUILT_STATIC_LIBRARY)
diff --git a/curl/prebuilt/android/arm64-v8a/libcrypto.a b/openssl/prebuilt/android/arm64-v8a/libcrypto.a
similarity index 100%
rename from curl/prebuilt/android/arm64-v8a/libcrypto.a
rename to openssl/prebuilt/android/arm64-v8a/libcrypto.a
diff --git a/curl/prebuilt/android/arm64-v8a/libssl.a b/openssl/prebuilt/android/arm64-v8a/libssl.a
similarity index 100%
rename from curl/prebuilt/android/arm64-v8a/libssl.a
rename to openssl/prebuilt/android/arm64-v8a/libssl.a
diff --git a/curl/prebuilt/android/armeabi-v7a/libcrypto.a b/openssl/prebuilt/android/armeabi-v7a/libcrypto.a
similarity index 100%
rename from curl/prebuilt/android/armeabi-v7a/libcrypto.a
rename to openssl/prebuilt/android/armeabi-v7a/libcrypto.a
diff --git a/curl/prebuilt/android/armeabi-v7a/libssl.a b/openssl/prebuilt/android/armeabi-v7a/libssl.a
similarity index 100%
rename from curl/prebuilt/android/armeabi-v7a/libssl.a
rename to openssl/prebuilt/android/armeabi-v7a/libssl.a
diff --git a/curl/prebuilt/android/armeabi/libcrypto.a b/openssl/prebuilt/android/armeabi/libcrypto.a
similarity index 100%
rename from curl/prebuilt/android/armeabi/libcrypto.a
rename to openssl/prebuilt/android/armeabi/libcrypto.a
diff --git a/curl/prebuilt/android/armeabi/libssl.a b/openssl/prebuilt/android/armeabi/libssl.a
similarity index 100%
rename from curl/prebuilt/android/armeabi/libssl.a
rename to openssl/prebuilt/android/armeabi/libssl.a
diff --git a/curl/prebuilt/android/x86/libcrypto.a b/openssl/prebuilt/android/x86/libcrypto.a
similarity index 100%
rename from curl/prebuilt/android/x86/libcrypto.a
rename to openssl/prebuilt/android/x86/libcrypto.a
diff --git a/curl/prebuilt/android/x86/libssl.a b/openssl/prebuilt/android/x86/libssl.a
similarity index 100%
rename from curl/prebuilt/android/x86/libssl.a
rename to openssl/prebuilt/android/x86/libssl.a
diff --git a/curl/prebuilt/ios/libcrypto.a b/openssl/prebuilt/ios/libcrypto.a
similarity index 100%
rename from curl/prebuilt/ios/libcrypto.a
rename to openssl/prebuilt/ios/libcrypto.a
diff --git a/curl/prebuilt/ios/libssl.a b/openssl/prebuilt/ios/libssl.a
similarity index 100%
rename from curl/prebuilt/ios/libssl.a
rename to openssl/prebuilt/ios/libssl.a
diff --git a/curl/prebuilt/mac/libcrypto.a b/openssl/prebuilt/mac/libcrypto.a
similarity index 100%
rename from curl/prebuilt/mac/libcrypto.a
rename to openssl/prebuilt/mac/libcrypto.a
diff --git a/curl/prebuilt/mac/libssl.a b/openssl/prebuilt/mac/libssl.a
similarity index 100%
rename from curl/prebuilt/mac/libssl.a
rename to openssl/prebuilt/mac/libssl.a
diff --git a/curl/prebuilt/win10/arm/libeay32.dll b/openssl/prebuilt/win10/arm/libeay32.dll
similarity index 100%
rename from curl/prebuilt/win10/arm/libeay32.dll
rename to openssl/prebuilt/win10/arm/libeay32.dll
diff --git a/curl/prebuilt/win10/arm/ssleay32.dll b/openssl/prebuilt/win10/arm/ssleay32.dll
similarity index 100%
rename from curl/prebuilt/win10/arm/ssleay32.dll
rename to openssl/prebuilt/win10/arm/ssleay32.dll
diff --git a/curl/prebuilt/win10/win32/libeay32.dll b/openssl/prebuilt/win10/win32/libeay32.dll
similarity index 100%
rename from curl/prebuilt/win10/win32/libeay32.dll
rename to openssl/prebuilt/win10/win32/libeay32.dll
diff --git a/curl/prebuilt/win10/win32/ssleay32.dll b/openssl/prebuilt/win10/win32/ssleay32.dll
similarity index 100%
rename from curl/prebuilt/win10/win32/ssleay32.dll
rename to openssl/prebuilt/win10/win32/ssleay32.dll
diff --git a/curl/prebuilt/win10/x64/libeay32.dll b/openssl/prebuilt/win10/x64/libeay32.dll
similarity index 100%
rename from curl/prebuilt/win10/x64/libeay32.dll
rename to openssl/prebuilt/win10/x64/libeay32.dll
diff --git a/curl/prebuilt/win10/x64/ssleay32.dll b/openssl/prebuilt/win10/x64/ssleay32.dll
similarity index 100%
rename from curl/prebuilt/win10/x64/ssleay32.dll
rename to openssl/prebuilt/win10/x64/ssleay32.dll
diff --git a/curl/prebuilt/win32/libeay32.lib b/openssl/prebuilt/win32/libeay32.lib
similarity index 100%
rename from curl/prebuilt/win32/libeay32.lib
rename to openssl/prebuilt/win32/libeay32.lib
diff --git a/curl/prebuilt/win32/ssleay32.lib b/openssl/prebuilt/win32/ssleay32.lib
similarity index 100%
rename from curl/prebuilt/win32/ssleay32.lib
rename to openssl/prebuilt/win32/ssleay32.lib
diff --git a/curl/prebuilt/winrt_8.1/arm/libeay32.dll b/openssl/prebuilt/winrt_8.1/arm/libeay32.dll
similarity index 100%
rename from curl/prebuilt/winrt_8.1/arm/libeay32.dll
rename to openssl/prebuilt/winrt_8.1/arm/libeay32.dll
diff --git a/curl/prebuilt/winrt_8.1/arm/ssleay32.dll b/openssl/prebuilt/winrt_8.1/arm/ssleay32.dll
similarity index 100%
rename from curl/prebuilt/winrt_8.1/arm/ssleay32.dll
rename to openssl/prebuilt/winrt_8.1/arm/ssleay32.dll
diff --git a/curl/prebuilt/winrt_8.1/win32/libeay32.dll b/openssl/prebuilt/winrt_8.1/win32/libeay32.dll
similarity index 100%
rename from curl/prebuilt/winrt_8.1/win32/libeay32.dll
rename to openssl/prebuilt/winrt_8.1/win32/libeay32.dll
diff --git a/curl/prebuilt/winrt_8.1/win32/ssleay32.dll b/openssl/prebuilt/winrt_8.1/win32/ssleay32.dll
similarity index 100%
rename from curl/prebuilt/winrt_8.1/win32/ssleay32.dll
rename to openssl/prebuilt/winrt_8.1/win32/ssleay32.dll
diff --git a/curl/prebuilt/wp_8.1/arm/libeay32.dll b/openssl/prebuilt/wp_8.1/arm/libeay32.dll
similarity index 100%
rename from curl/prebuilt/wp_8.1/arm/libeay32.dll
rename to openssl/prebuilt/wp_8.1/arm/libeay32.dll
diff --git a/curl/prebuilt/wp_8.1/arm/libeay32.lib b/openssl/prebuilt/wp_8.1/arm/libeay32.lib
similarity index 100%
rename from curl/prebuilt/wp_8.1/arm/libeay32.lib
rename to openssl/prebuilt/wp_8.1/arm/libeay32.lib
diff --git a/curl/prebuilt/wp_8.1/arm/ssleay32.dll b/openssl/prebuilt/wp_8.1/arm/ssleay32.dll
similarity index 100%
rename from curl/prebuilt/wp_8.1/arm/ssleay32.dll
rename to openssl/prebuilt/wp_8.1/arm/ssleay32.dll
diff --git a/curl/prebuilt/wp_8.1/arm/ssleay32.lib b/openssl/prebuilt/wp_8.1/arm/ssleay32.lib
similarity index 100%
rename from curl/prebuilt/wp_8.1/arm/ssleay32.lib
rename to openssl/prebuilt/wp_8.1/arm/ssleay32.lib
diff --git a/curl/prebuilt/wp_8.1/win32/libeay32.dll b/openssl/prebuilt/wp_8.1/win32/libeay32.dll
similarity index 100%
rename from curl/prebuilt/wp_8.1/win32/libeay32.dll
rename to openssl/prebuilt/wp_8.1/win32/libeay32.dll
diff --git a/curl/prebuilt/wp_8.1/win32/libeay32.lib b/openssl/prebuilt/wp_8.1/win32/libeay32.lib
similarity index 100%
rename from curl/prebuilt/wp_8.1/win32/libeay32.lib
rename to openssl/prebuilt/wp_8.1/win32/libeay32.lib
diff --git a/curl/prebuilt/wp_8.1/win32/ssleay32.dll b/openssl/prebuilt/wp_8.1/win32/ssleay32.dll
similarity index 100%
rename from curl/prebuilt/wp_8.1/win32/ssleay32.dll
rename to openssl/prebuilt/wp_8.1/win32/ssleay32.dll
diff --git a/curl/prebuilt/wp_8.1/win32/ssleay32.lib b/openssl/prebuilt/wp_8.1/win32/ssleay32.lib
similarity index 100%
rename from curl/prebuilt/wp_8.1/win32/ssleay32.lib
rename to openssl/prebuilt/wp_8.1/win32/ssleay32.lib
diff --git a/version.json b/version.json
index 1e156eed3..9738ef0a4 100644
--- a/version.json
+++ b/version.json
@@ -1,5 +1,5 @@
 {
-    "prebuilt_libs_version":"v3-deps-116",
+    "prebuilt_libs_version":"v3-deps-117",
     "freetype":"2.5.5",
     "curl":"7.50.0",
     "jpeg":"9.0",