bump OpenSSL to 1.1.1i

Signed-off-by: oleg.hoefling <[email protected]>

Author: hoefling

appveyor.yml

@@ -7,8 +7,13 @@ install:
 - cmd: git submodule update --init --recursive
 build: off
 build_script:
-- ps: $env:Path = "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\;" + $env:Path
-- ps: $env:INCLUDE += ";C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared;C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include"
+#- ps: Install-Package PowerShellGet -Force
+- ps: Install-Module -Name Pscx -scope CurrentUser -AllowClobber -AllowPrerelease -RequiredVersion 4.0.0-beta2
+- ps: Install-Module -Name VSSetup -scope CurrentUser
+- ps: $env:Path = "C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin;" + $env:Path
+#- ps: $env:Path = "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\;C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin;C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\$env:Architecture;" + $env:Path
+#- ps: $env:INCLUDE += ";C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared;C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include"
+#- ps: $env:LIB += ";C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\lib;C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\$env:Architecture;C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\$env:Architecture"
 - ps: >-
     $x64param = if ($env:Architecture -eq 'x64') { $true } else { $false }
     .\build.ps1 -x64:$x64param

build.ps1

@@ -15,9 +15,10 @@ Function ThrowIfError($exitCode, $module)
 
 #$ErrorActionPreference = "Stop"
 
-echo $env:Path
-Get-Command nmake
-Get-Command link
+#Get-VSSetupInstance
+#Get-InstalledModule -Name "VSSetup"
+
+Import-VisualStudioVars -VisualStudioVersion 160 -Architecture $vcvarsarch
 
 $x64Dir = If($x64) { "\x64" } Else { "" }
 $distname = If($x64) { "win64" } Else { "win32" }
@@ -63,30 +64,28 @@ Set-Location ..\..
 
 # openssl
 $sslTarget = If($x64) { "VC-WIN64A" } Else { "VC-WIN32" }
-$sslDo = If($x64) { "do_win64a.bat" } Else { "do_ms.bat" }
 
 Set-Location .\openssl
-Start-Process -NoNewWindow -Wait perl "Configure no-asm enable-static-engine $sslTarget"
-Start-Process -NoNewWindow -Wait .\ms\$sslDo
-$p = Start-Process -NoNewWindow -Wait -PassThru nmake "-f .\ms\nt.mak init lib"
+Start-Process -NoNewWindow -Wait perl "Configure no-asm no-shared $sslTarget"
+$p = Start-Process -NoNewWindow -Wait -PassThru nmake
 ThrowIfError $p.ExitCode "openssl"
 
-$sslLib = Join-Path (pwd) "out32"
-$sslInc = Join-Path (pwd) "inc32"
+$sslLib = Join-Path (pwd).Path
+$sslInc = Join-Path (pwd) "include"
 Set-Location ..
 
 # xmlsec
 Set-Location .\xmlsec\win32
 cscript configure.js lib="$zlibLib;$iconvLib;$xmlLib;$sslLib;$xsltLib" include="$zlibInc;$iconvInc;$xmlInc;$sslInc;$xsltInc" iconv=yes xslt=yes unicode=yes static=yes with-dl=no
 nmake xmlseca
-$p = Start-Process -NoNewWindow -Wait -PassThru nmake xmlseca
-ThrowIfError $p.ExitCode "xmlsec"
+#$p = Start-Process -NoNewWindow -Wait -PassThru nmake xmlseca
+#ThrowIfError $p.ExitCode "xmlsec"
 $xmlsecLib = Join-Path (pwd) binaries
 $xmlsecInc = Join-Path (pwd) ..\include
 Set-Location ../..
 
 # Pushed by Import-VisualStudioVars
-#Pop-EnvironmentBlock
+Pop-EnvironmentBlock
 
 # Bundle releases
 Function BundleRelease($name, $lib, $inc)
@@ -101,8 +100,8 @@ Function BundleRelease($name, $lib, $inc)
     Copy-Item -Recurse $inc .\dist\$name\include
     Get-ChildItem -File -Recurse .\dist\$name\include | Where{$_.Name -NotMatch ".h$" } | Remove-Item
 
-    #Write-Zip  .\dist\$name .\dist\$name.zip
-    Compress-Archive -Path .\dist\$name -DestinationPath .\dist\$name.zip
+    Write-Zip  .\dist\$name .\dist\$name.zip
+    #Compress-Archive -Path .\dist\$name -DestinationPath .\dist\$name.zip
     Remove-Item -Recurse -Path .\dist\$name
 }
 
@@ -116,5 +115,5 @@ BundleRelease "iconv-1.16.$distname" (dir $iconvLib\iconv_a*) (dir $iconvInc\*)
 BundleRelease "libxml2-2.9.10.$distname" (dir $xmlLib\*) (Get-Item $xmlInc\libxml)
 BundleRelease "libxslt-1.1.34.$distname" (dir .\libxslt\win32\bin.msvc\*) (Get-Item .\libxslt\libxslt,.\libxslt\libexslt)
 BundleRelease "zlib-1.2.11.$distname" (Get-Item .\zlib\*.*) (Get-Item .\zlib\zconf.h,.\zlib\zlib.h)
-BundleRelease "openssl-1.0.2k.$distname" (dir $sslLib\*) (Get-Item $sslInc\openssl)
+#BundleRelease "openssl-1.1.1i.$distname" (dir $sslLib\*) (Get-Item $sslInc\openssl)
 BundleRelease "xmlsec-1.2.31.$distname" (dir $xmlsecLib\*) (Get-Item $xmlsecInc\xmlsec)