Skip to content

Commit

Permalink
build: update openssl to 1.1.1n
Browse files Browse the repository at this point in the history
This is required to fix arm64 builds under the Android ndk.
  • Loading branch information
jgriffiths committed May 4, 2022
1 parent e794c47 commit f47191c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions subprojects/openssl.wrap
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions tools/buildopenssl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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
Expand Down

0 comments on commit f47191c

Please sign in to comment.