aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2019-11-05 08:45:28 +0200
committerHeikki Halmet <heikki.halmet@qt.io>2019-11-14 07:52:12 +0200
commit4da5ec28680ca70c3125bf54ee1a604149c57548 (patch)
tree2c0366b813379bcbbac6e2448abbdfbe575697b2
parent392b6a0329c66050cad95e4558d851607a8a2cc7 (diff)
Provisioning: Upgrade openssl to version 1.0.2t
5.9 branch don't support openssl 1.1.1 series so we need to use latest version from 1.0.2 Task-number: QTQAINFRA-3336 Change-Id: I94eb9f553375da0ae8d04ceb55d1eace16f4f396 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
-rw-r--r--coin/provisioning/common/windows/openssl.ps16
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh4
2 files changed, 5 insertions, 5 deletions
diff --git a/coin/provisioning/common/windows/openssl.ps1 b/coin/provisioning/common/windows/openssl.ps1
index 1495f665..797ff6c7 100644
--- a/coin/provisioning/common/windows/openssl.ps1
+++ b/coin/provisioning/common/windows/openssl.ps1
@@ -36,7 +36,7 @@
# This script installs OpenSSL $version.
# Both x86 and x64 versions needed when x86 integrations are done on x64 machine
-$version = "1_0_2p"
+$version = "1_0_2t"
$packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe"
$packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe"
@@ -47,7 +47,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 = "ec8b4111afb86ffc81837a30667aa076afe9d1e6"
+ $sha1 = "92288fb8f5d1af36960da518a21ed76cd9d7bd55"
Write-Host "Fetching from URL ..."
Download $externalUrl $internalUrl $packagex64
Verify-Checksum $packagex64 $sha1
@@ -73,7 +73,7 @@ if (Is64BitWinHost) {
$externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe"
-$sha1 = "753d6b2cb8b6c808f6212bd21b6e6e7822a4e236"
+$sha1 = "db9bb96d33f2393e2a9912a28e2921e6bc879203"
Write-Host "Fetching from URL ..."
Download $externalUrl $internalUrl $packagex86
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh
index f836cf1d..0d44cefb 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh
@@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../common/unix/InstallFromCompressedFileFromURL.sh"
# shellcheck source=../common/unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-opensslVersion="1.0.2p"
+opensslVersion="1.0.2t"
opensslFile="openssl-$opensslVersion.tar.gz"
opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile"
opensslAltDlUrl="https://www.openssl.org/source/$opensslFile"
-opensslSha1="f34b5322e92415755c7d58bf5d0d5cf37666382c"
+opensslSha1="8ac3fd379cf8c8ef570abb51ec52a88fd526f88a"
# Below target location has been hard coded into Coin.
# QTQAINFRA-1195