From 4fd88142121473f8563b6b71d13b2af8f9d1cc70 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 3 Feb 2022 21:23:04 -0800 Subject: [PATCH] build-system: update to current OpenSSL version This is required to compile it on ARM64 Macs (and of course also is the right thing to do overall). Signed-off-by: Dirk Hohndel --- packaging/android/variables.sh | 2 +- scripts/get-dep-lib.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/android/variables.sh b/packaging/android/variables.sh index f2c940a77..9a46d403d 100644 --- a/packaging/android/variables.sh +++ b/packaging/android/variables.sh @@ -11,4 +11,4 @@ ANDROID_PLATFORMS=android-29 ANDROID_NDK=ndk/${NDK_VERSION} # OpenSSL also has an entry in get-dep-lib.sh line 103 # that needs to be updated as well. -OPENSSL_VERSION=1.1.1h +OPENSSL_VERSION=1.1.1m diff --git a/scripts/get-dep-lib.sh b/scripts/get-dep-lib.sh index d7ddf6f58..45e19c75b 100755 --- a/scripts/get-dep-lib.sh +++ b/scripts/get-dep-lib.sh @@ -7,7 +7,7 @@ CURRENT_LIBZIP="rel-1-5-1" CURRENT_LIBGIT2="v1.0.1" CURRENT_LIBCURL="curl-7_54_1" CURRENT_LIBUSB="v1.0.25" -CURRENT_OPENSSL="OpenSSL_1_1_1h" +CURRENT_OPENSSL="OpenSSL_1_1_1m" CURRENT_LIBSSH2="libssh2-1.8.0" CURRENT_XSLT="v1.1.34" CURRENT_SQLITE="3190200" @@ -103,7 +103,7 @@ fi # FIX FOR ANDROID, if [ "$PLATFORM" == "singleAndroid" ] ; then - CURRENT_OPENSSL="OpenSSL_1_1_1h" + CURRENT_OPENSSL="OpenSSL_1_1_1m" # If changing the openSSL version here, make sure to change it in packaging/android/variables.sh also. fi # no curl and old libs (never version breaks)