lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Provisioning: Update OpenSSL to version 1.1.1g

Browse Source 
Task-number: QTQAINFRA-3819
Change-Id: Ie7d0f3a0c73d123c3f3536e6b2dd2eb8608eb9cd
(cherry picked from commit 2ac3dd2d6f)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
This commit is contained in:
Heikki Halmet
2020-06-22 09:43:37 +03:00
parent 75ae2c8579
commit 7143d018dc
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coin/provisioning/common/linux/openssl_for_android_linux.sh
View File

@@ -2,7 +2,7 @@
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Copyright (C) 2020 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -53,11 +53,11 @@ else
rm -rf "$exports_file"
fi
version="1.1.1d"
version="1.1.1g"
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="056057782325134b76d1931c48f2c7e6595d7ef4"
sha="b213a293f2127ec3e323fb3cfc0c9807664fd997"
opensslHome="${HOME}/openssl/android/openssl-${version}"
DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
mkdir -p "${HOME}/openssl/android/"

6
coin/provisioning/common/unix/install-openssl.sh
View File

@@ -2,7 +2,7 @@
#############################################################################
##
## Copyright (C) 2019 The Qt Company Ltd.
## Copyright (C) 2020 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="1.1.1d"
version="1.1.1g"
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="056057782325134b76d1931c48f2c7e6595d7ef4"
sha="b213a293f2127ec3e323fb3cfc0c9807664fd997"
opensslHome="${HOME}/openssl-${version}"
opensslSource="${opensslHome}-src"
DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"

6
coin/provisioning/common/windows/android-openssl.ps1
View File

@@ -1,6 +1,6 @@
############################################################################
##
## Copyright (C) 2019 The Qt Company Ltd.
## Copyright (C) 2020 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -45,9 +45,9 @@ 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.1d"
$version = "1.1.1g"
$zip = Get-DownloadLocation ("openssl-$version.tar.gz")
$sha1 = "056057782325134b76d1931c48f2c7e6595d7ef4"
$sha1 = "b213a293f2127ec3e323fb3cfc0c9807664fd997"
$destination = "C:\Utils\openssl-android-master"
# msys unix style paths

8
coin/provisioning/common/windows/openssl.ps1
View File

@@ -1,6 +1,6 @@
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Copyright (C) 2020 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -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_1_1d"
$version = "1_1_1g"
$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 = "df9c40e9e82edf693c15302cbc8e8a057857a13c"
$sha1 = "7643561c372720f55de51454a707ede334db086e"
Write-Host "Fetching from URL ..."
Download $externalUrl $internalUrl $packagex64
@@ -74,7 +74,7 @@ if (Is64BitWinHost) {
$externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe"
$sha1 = "5c49ccd3a5d17f63d25fb819963978f50c7966d0"
$sha1 = "c7d4b096c2413d1af819ccb291214fa3c4cece07"
Write-Host "Fetching from URL ..."
Download $externalUrl $internalUrl $packagex86

4
coin/provisioning/qtci-windows-7-x86/09-openssl.ps1
View File

@@ -43,9 +43,9 @@
# nmake install
$version = "1.1.1d"
$version = "1.1.1g"
$zip = Get-DownloadLocation ("openssl-$version.7z")
$sha1 = "2bf9379c4cea81858c4288cf06cc3444996bcad5"
$sha1 = "e94263ba067a5cc0ace17e26bb2f98c62d298b5a"
$url = "http://ci-files01-hki.intra.qt.io/input/openssl/openssl_${version}_prebuild_x86_windows7_msvc2010.zip"
Download $url $url $zip