From f47191c71ae9ee8e7bd8271495a0ea7f7a94eab5 Mon Sep 17 00:00:00 2001
From: Jon Griffiths <jon_p_griffiths@yahoo.com>
Date: Thu, 28 Apr 2022 14:34:05 +1200
Subject: [PATCH] build: update openssl to 1.1.1n

This is required to fix arm64 builds under the Android ndk.
---
 .gitlab-ci.yml           |  2 +-
 subprojects/openssl.wrap | 10 +++++-----
 tools/buildopenssl.sh    |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f5066d9f7..60ac365a5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -163,7 +163,7 @@ test_rust:
     - git clone https://github.com/ElementsProject/libwally-core
     - cd libwally-core && git checkout 88fc78ff72a4f3345fcb87d1c19dc5f6cc5b0e4c && ./tools/autogen.sh && ./configure --enable-debug --prefix=$PWD/build --enable-static --disable-shared --enable-elements --enable-ecmult-static-precomputation && make && make install && cd ..
     - export WALLY_DIR=$PWD/libwally-core/build/lib/
-    - curl -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1g.tar.gz | tar -xvz -C ${PWD}/subprojects
+    - curl -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1n.tar.gz | tar -xvz -C ${PWD}/subprojects
     - MESON_SOURCE_ROOT=${PWD} MESON_BUILD_ROOT=${PWD} ${PWD}/tools/buildopenssl.sh
     - export OPENSSL_DIR=${PWD}/openssl/build OPENSSL_STATIC=1
     - curl -L https://github.com/RCasatta/electrsd/releases/download/electrs_releases/electrs_linux_esplora_703c6a20d52b61a234a18812503bd754d448992a.gz | tar -xvz
diff --git a/subprojects/openssl.wrap b/subprojects/openssl.wrap
index 56d65bcf4..725cc8682 100644
--- a/subprojects/openssl.wrap
+++ b/subprojects/openssl.wrap
@@ -1,10 +1,10 @@
 [wrap-file]
-directory = openssl-OpenSSL_1_1_1g
+directory = openssl-OpenSSL_1_1_1n
 
-source_url = https://github.com/openssl/openssl/archive/OpenSSL_1_1_1g.tar.gz
-source_filename = openssl-OpenSSL_1_1_1g.tar.gz
-source_hash = 281e4f13142b53657bd154481e18195b2d477572fdffa8ed1065f73ef5a19777
+source_url = https://github.com/openssl/openssl/archive/OpenSSL_1_1_1n.tar.gz
+source_filename = openssl-OpenSSL_1_1_1n.tar.gz
+source_hash = 6b2d2440ced8c802aaa61475919f0870ec556694c466ebea460e35ea2b14839e
 
 patch_url = file:./subprojects/openssl-meson/openssl-meson-281e4f13142b53657bd154481e18195b2d477572fdffa8ed1065f73ef5a19777.tar
 patch_filename = openssl-meson-281e4f13142b53657bd154481e18195b2d477572fdffa8ed1065f73ef5a19777.tar
-patch_hash = 93bb32d001c9419870c58fe0829e219ae95da54aebae86ced74e03fc6c09c708
+patch_hash = 47165ebdf4c5bcb34b55d4d29ab8c135a208d0fb315b4324b79ef73bd56dc1e3
diff --git a/tools/buildopenssl.sh b/tools/buildopenssl.sh
index 1237c15b3..0109efaf7 100755
--- a/tools/buildopenssl.sh
+++ b/tools/buildopenssl.sh
@@ -15,7 +15,7 @@ else
     exit 1
 fi
 
-OPENSSL_NAME="openssl-OpenSSL_1_1_1g"
+OPENSSL_NAME="openssl-OpenSSL_1_1_1n"
 OPENSSL_OPTIONS="enable-ec_nistp_64_gcc_128 no-gost no-shared no-dso no-ssl2 no-ssl3 no-idea no-dtls no-dtls1 no-weak-ssl-ciphers no-comp -fvisibility=hidden no-err no-psk no-srp"
 OPENSSL_MOBILE="no-hw no-engine"
 
@@ -34,8 +34,8 @@ if [ \( "$1" = "--ndk" \) ]; then
             OPENSSL_OPTIONS=$(echo $OPENSSL_OPTIONS | $SED -e "s/enable-ec_nistp_64_gcc_128//g")
     fi
     . ${MESON_SOURCE_ROOT}/tools/env.sh
-    $SED -ie "115s!\$triarch\-!!" "Configurations/15-android.conf"
-    $SED -ie "119s!\$triarch\-!!" "Configurations/15-android.conf"
+    $SED -ie "133s!\$triarch\-!!" "Configurations/15-android.conf"
+    $SED -ie "137s!\$triarch\-!!" "Configurations/15-android.conf"
     if [ $HOST_ARCH = "armeabi-v7a" ]; then
         OPENSSL_OPTIONS="$OPENSSL_OPTIONS no-asm"
     fi