From 3e838f2a34d0c1538535bd184aa12681497c8a38 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Thu, 1 Nov 2018 12:23:34 +0200 Subject: Provisioning: Change openssl version to 1.1.1b Use newest LTS version of openssl as support for 1.0.2 series will end at end of 2019. For windows 7 x86 openssl 1.0.2 will be used until all need fixed are made to submodule tests Task-number: QTQAINFRA-2327 Change-Id: I930d239cd139b6202ebdfb5cdc8068ff2ad0b8a3 Reviewed-by: Jani Heikkinen --- .../provisioning/qtci-windows-7-x86/09-openssl.ps1 | 95 +++++++++++++++++++++- 1 file changed, 94 insertions(+), 1 deletion(-) (limited to 'coin/provisioning/qtci-windows-7-x86/09-openssl.ps1') diff --git a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 index d57ad1cd..ae867cdc 100644 --- a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 @@ -1 +1,94 @@ -. "$PSScriptRoot\..\common\windows\openssl.ps1" +############################################################################# +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +. "$PSScriptRoot\..\common\windows\helpers.ps1" + +# This script installs OpenSSL $version. +# Both x86 and x64 versions needed when x86 integrations are done on x64 machine + +$version = "1_0_2p" +$packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe" +$packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" + +if (Is64BitWinHost) { + + # Install x64 bit version + $architecture = "x64" + $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" + + Write-Host "Fetching from URL ..." + Download $externalUrl $internalUrl $packagex64 + Verify-Checksum $packagex64 $sha1 + Write-Host "Installing $packagex64 ..." + Run-Executable "$packagex64" "/SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder" + + Write-Host "Remove downloaded $packagex64 ..." + Remove-Item -Path $packagex64 + + Set-EnvironmentVariable "OPENSSL_CONF_x64" "$installFolder\bin\openssl.cfg" + Set-EnvironmentVariable "OPENSSL_INCLUDE_x64" "$installFolder\include" + Set-EnvironmentVariable "OPENSSL_LIB_x64" "$installFolder\lib" +} + +# Install x86 bit version +$architecture = "x86" + +if (Is64BitWinHost) { + $installFolder = "C:\openssl$architecture" +} else { + $installFolder = "C:\openssl" +} + +$externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" +$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe" +$sha1 = "753d6b2cb8b6c808f6212bd21b6e6e7822a4e236" + +Write-Host "Fetching from URL ..." +Download $externalUrl $internalUrl $packagex86 +Verify-Checksum $packagex86 $sha1 +Write-Host "Installing $packagex86 ..." +Run-Executable "$packagex86" "/SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder" + +Write-Host "Remove downloaded $packagex86 ..." +Remove-Item -Path $packagex86 + +Set-EnvironmentVariable "OPENSSL_CONF_x86" "$installFolder\bin\openssl.cfg" +Set-EnvironmentVariable "OPENSSL_INCLUDE_x86" "$installFolder\include" +Set-EnvironmentVariable "OPENSSL_LIB_x86" "$installFolder\lib" + +# Store version information to ~/versions.txt, which is used to print version information to provision log. +Write-Output "OpenSSL = $version" >> ~/versions.txt + -- cgit v1.2.3 From 247b429c3c435a62df3d6f94c96c7cd1b7c22299 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 22 May 2019 13:13:16 +0300 Subject: Install prebuilded OpenSSL 1.1.1b for Windows 7 Change-Id: Ie1ec2d6aaeea8432a654741ed7969cc66c3da7f5 Reviewed-by: Jani Heikkinen --- .../provisioning/qtci-windows-7-x86/09-openssl.ps1 | 67 ++++++---------------- 1 file changed, 18 insertions(+), 49 deletions(-) (limited to 'coin/provisioning/qtci-windows-7-x86/09-openssl.ps1') diff --git a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 index ae867cdc..f90938c4 100644 --- a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 @@ -33,62 +33,31 @@ . "$PSScriptRoot\..\common\windows\helpers.ps1" -# This script installs OpenSSL $version. -# Both x86 and x64 versions needed when x86 integrations are done on x64 machine +# This script will install OpenSSL prebuild version. Currently this pre-build version is only needed for Windows 7. +# Version was build using Windows 7 x86 and MSVC2010 -$version = "1_0_2p" -$packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe" -$packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" +# Used build commands below: +# call "C:\Program Files\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86 +# perl Configure no-asm VC-WIN32 --prefix=C:\openssl\ --openssldir=C:\openssl\ +# nmake +# nmake install -if (Is64BitWinHost) { - # Install x64 bit version - $architecture = "x64" - $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" +$version = "1.1.1b" +$zip = Get-DownloadLocation ("openssl-$version.7z") +$sha1 = "7afba53ab984cecb54a1915c135cbb2a20c6b576" +$url = "http://ci-files01-hki.intra.qt.io/input/openssl/openssl_${version}_prebuild_x86.7z" - Write-Host "Fetching from URL ..." - Download $externalUrl $internalUrl $packagex64 - Verify-Checksum $packagex64 $sha1 - Write-Host "Installing $packagex64 ..." - Run-Executable "$packagex64" "/SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder" +Download $url $url $zip +Verify-Checksum $zip $sha1 +$installFolder = "C:\openssl" - Write-Host "Remove downloaded $packagex64 ..." - Remove-Item -Path $packagex64 +Extract-7Zip $zip "C:\" +Remove-Item -Path $zip - Set-EnvironmentVariable "OPENSSL_CONF_x64" "$installFolder\bin\openssl.cfg" - Set-EnvironmentVariable "OPENSSL_INCLUDE_x64" "$installFolder\include" - Set-EnvironmentVariable "OPENSSL_LIB_x64" "$installFolder\lib" -} - -# Install x86 bit version -$architecture = "x86" - -if (Is64BitWinHost) { - $installFolder = "C:\openssl$architecture" -} else { - $installFolder = "C:\openssl" -} - -$externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" -$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe" -$sha1 = "753d6b2cb8b6c808f6212bd21b6e6e7822a4e236" - -Write-Host "Fetching from URL ..." -Download $externalUrl $internalUrl $packagex86 -Verify-Checksum $packagex86 $sha1 -Write-Host "Installing $packagex86 ..." -Run-Executable "$packagex86" "/SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder" - -Write-Host "Remove downloaded $packagex86 ..." -Remove-Item -Path $packagex86 - -Set-EnvironmentVariable "OPENSSL_CONF_x86" "$installFolder\bin\openssl.cfg" +Set-EnvironmentVariable "OPENSSL_CONF_x86" "$installFolder\openssl.cnf" Set-EnvironmentVariable "OPENSSL_INCLUDE_x86" "$installFolder\include" Set-EnvironmentVariable "OPENSSL_LIB_x86" "$installFolder\lib" +Prepend-Path "$installFolder\bin" -# Store version information to ~/versions.txt, which is used to print version information to provision log. Write-Output "OpenSSL = $version" >> ~/versions.txt - -- cgit v1.2.3