summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2019-06-04 16:19:50 +0200
committerArne Schwabe <arne@rfc2549.org>2019-08-05 16:01:34 +0200
commit25869626cd5ed47364f600401057deb05de9d44a (patch)
treec5b62fde98a9f2e4ba22c05af826463d22363148 /main
parentc6a64e1749ef8f5d947bf08a035f36883cff9152 (diff)
Import OpenSSL 1.1.1c
Diffstat (limited to 'main')
m---------main/src/main/cpp/openssl0
-rw-r--r--main/src/main/cpp/openssl.cmake6
2 files changed, 2 insertions, 4 deletions
diff --git a/main/src/main/cpp/openssl b/main/src/main/cpp/openssl
-Subproject 01d189e12d6043ef3e15ef6d1ea17d2b4447e7d
+Subproject a87be723616913f2d9d338fc8327633da096dee
diff --git a/main/src/main/cpp/openssl.cmake b/main/src/main/cpp/openssl.cmake
index dbf1efcc..5d4ffb47 100644
--- a/main/src/main/cpp/openssl.cmake
+++ b/main/src/main/cpp/openssl.cmake
@@ -745,8 +745,7 @@ if (${ANDROID_ABI} STREQUAL "armeabi-v7a")
-DOPENSSL_BN_ASM_GF2m
-DOPENSSL_BN_ASM_PART_WORDS
-DOPENSSL_IA32_SSE2
- -DPADLOCK_ASM
- -DPOLY1305_ASM
+ -DPOLY1305_ASM
-DRC4_ASM
-DRMD160_ASM
-DVPAES_ASM
@@ -761,8 +760,7 @@ if (${ANDROID_ABI} STREQUAL "armeabi-v7a")
-DOPENSSL_BN_ASM_GF2m
-DOPENSSL_BN_ASM_MONT5
-DOPENSSL_IA32_SSE2
- -DPADLOCK_ASM
- -DPOLY1305_ASM
+ -DPOLY1305_ASM
-DRC4_ASM
-DVPAES_ASM
-DX25519_ASM