From 25869626cd5ed47364f600401057deb05de9d44a Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Tue, 4 Jun 2019 16:19:50 +0200
Subject: Import OpenSSL 1.1.1c

---
 main/src/main/cpp/openssl       | 2 +-
 main/src/main/cpp/openssl.cmake | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/main/src/main/cpp/openssl b/main/src/main/cpp/openssl
index 01d189e1..a87be723 160000
--- a/main/src/main/cpp/openssl
+++ b/main/src/main/cpp/openssl
@@ -1 +1 @@
-Subproject commit 01d189e12d6043ef3e15ef6d1ea17d2b4447e7de
+Subproject commit a87be723616913f2d9d338fc8327633da096dee2
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
-- 
cgit v1.2.3