diff options
author | Heikki Halmet <heikki.halmet@qt.io> | 2022-01-18 11:07:05 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-02-16 18:47:59 +0000 |
commit | a7fed578ed88ec798690a20219283dce877625a1 (patch) | |
tree | 06b8b963147976e18d3b8b2d322ed3e0fec75479 | |
parent | 3af2d458dd795f19c7c661f6e6b27e31c64c65b5 (diff) |
Provisioning: Update OpenSSL to version 1.1.1m
Change-Id: I93702b9faac5abc9fc01a5725cf34a17a94f0bea
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 87321654619f9a336f702d746bbb5d9a26bd9dc6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
5 files changed, 20 insertions, 20 deletions
diff --git a/coin/provisioning/common/unix/install-openssl.sh b/coin/provisioning/common/unix/install-openssl.sh index 479245d6..221b4435 100755 --- a/coin/provisioning/common/unix/install-openssl.sh +++ b/coin/provisioning/common/unix/install-openssl.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2021 The Qt Company Ltd. +## Copyright (C) 2022 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -48,11 +48,11 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="1.1.1k" +version="1.1.1m" officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz" targetFile="/tmp/openssl-$version.tar.gz" -sha="bad9dc4ae6dcc1855085463099b5dacb0ec6130b" +sha="39d424c4411e45f1570073d7a71b1830b96007ca" opensslHome="${HOME}/openssl-${version}" opensslSource="${opensslHome}-src" DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" diff --git a/coin/provisioning/common/unix/openssl_for_android.sh b/coin/provisioning/common/unix/openssl_for_android.sh index e2cb4395..38be2c97 100755 --- a/coin/provisioning/common/unix/openssl_for_android.sh +++ b/coin/provisioning/common/unix/openssl_for_android.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2021 The Qt Company Ltd. +## Copyright (C) 2022 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -48,7 +48,7 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="1.1.1k" +version="1.1.1m" : ' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK 21 # Source built requires GCC and Perl to be in PATH. exports_file="/tmp/export.sh" @@ -66,7 +66,7 @@ fi officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz" targetFile="/tmp/openssl-$version.tar.gz" -sha="bad9dc4ae6dcc1855085463099b5dacb0ec6130b" +sha="39d424c4411e45f1570073d7a71b1830b96007ca" opensslHome="${HOME}/openssl/android/openssl-${version}" DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" mkdir -p "${HOME}/openssl/android/" @@ -82,11 +82,11 @@ PATH=$TOOLCHAIN:$PATH CC=clang make build_generated ' if uname -a |grep -q "Darwin"; then - prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_k_for-android-ndk-21_darwin.tar.gz" - sha="6e3e48441ff58596f25bc27fdc05ae43e5a7581d" + prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_m_for-android-ndk-21_darwin.tar.gz" + sha="d8c189f8a329263365c73bc471b6c9c68d117e3a" else - prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_k_for-android-ndk-21.tar.gz" - sha="8c4db1eb8460d749c998a0e033b3939123cbc5ac" + prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_m_for-android-ndk-21.tar.gz" + sha="db028f25ca4d000fe2317c3abfdfa0c234833549" fi targetFile="/tmp/prebuilt-openssl-$version.tar.gz" DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile" diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index 325f6048..5b564dbf 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2021 The Qt Company Ltd. +## Copyright (C) 2022 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -51,10 +51,10 @@ if (Is64BitWinHost) { # Msys need to be installed to target machine # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html -$version = "1.1.1k" +$version = "1.1.1m" $zip = Get-DownloadLocation ("openssl-$version.tar.gz") $prebuilt_zip = Get-DownloadLocation ("openssl-android-master-$version.zip") -$sha1 = "bad9dc4ae6dcc1855085463099b5dacb0ec6130b" +$sha1 = "39d424c4411e45f1570073d7a71b1830b96007ca" $prebuilt_sha1 = "07fad2a44ffa90261a779782bd64fe2304487945" $destination = "C:\Utils\openssl-android-master" $prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-android-master-$version.zip" diff --git a/coin/provisioning/common/windows/openssl-arm64.ps1 b/coin/provisioning/common/windows/openssl-arm64.ps1 index f57d4b20..3af34428 100644 --- a/coin/provisioning/common/windows/openssl-arm64.ps1 +++ b/coin/provisioning/common/windows/openssl-arm64.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2021 The Qt Company Ltd. +## Copyright (C) 2022 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -56,9 +56,9 @@ # nmake install ################################################################################################################################################# -$version = "1_1_1_k" +$version = "1_1_1_m" $url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version-arm64.zip" -$sha1 = "e31f6d3a4af225f9314830aad099bb8e5d4a7ff1" +$sha1 = "52963bba9b542eb885f19641f5cd78870246ea02" $installFolder = "C:\openssl_arm64" $zip_package = "C:\Windows\Temp\$version.zip" diff --git a/coin/provisioning/common/windows/openssl.ps1 b/coin/provisioning/common/windows/openssl.ps1 index be1ba236..526c59f5 100644 --- a/coin/provisioning/common/windows/openssl.ps1 +++ b/coin/provisioning/common/windows/openssl.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2021 The Qt Company Ltd. +## Copyright (C) 2022 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -42,7 +42,7 @@ # This script installs OpenSSL $version. # Both x86 and x64 versions needed when x86 integrations are done on x64 machine -$version = "1_1_1k" +$version = "1_1_1m" $packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe" $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" @@ -53,7 +53,7 @@ if (Is64BitWinHost) { $installFolder = "C:\openssl" $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe" - $sha1 = "ab5367a1f46a3779a870fe2c1a99e03f8ffa3041" + $sha1 = "16d83bd6d36be7b3ea85f822135352fa8f8d8134" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex64 @@ -80,7 +80,7 @@ if (Is64BitWinHost) { $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe" -$sha1 = "49f5b7fe01d686f706071c9a00d19bd69f2e7371" +$sha1 = "1d7146e56b201404ce67f1e636eab360211c175a" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex86 |