[openssl] Update UWP/WinRT to 1.0.2k

3 files changed, 5 insertions, 194 deletions

diff --git a/ports/openssl/CONTROL b/ports/openssl/CONTROL
index 2486f0358..6fb520404 100644
--- a/ports/openssl/CONTROL
+++ b/ports/openssl/CONTROL
@@ -1,3 +1,3 @@
 Source: openssl
-Version: 1.0.2k-1
+Version: 1.0.2k-2
 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.
diff --git a/ports/openssl/portfile-uwp.cmake b/ports/openssl/portfile-uwp.cmake
index f4a0a716b..289c549fc 100644
--- a/ports/openssl/portfile-uwp.cmake
+++ b/ports/openssl/portfile-uwp.cmake
@@ -26,16 +26,16 @@ endif()
 
 include(vcpkg_common_functions)
 
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-OpenSSL_1_0_2j_WinRT)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-OpenSSL_1_0_2k_WinRT)
 
 vcpkg_find_acquire_program(PERL)
 get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
 set(ENV{PATH} "${PERL_EXE_PATH};$ENV{PATH}")
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/Microsoft/openssl/archive/OpenSSL_1_0_2j_WinRT.zip"
-    FILENAME "openssl-microsoft-1.0.2j_WinRT.zip"
-    SHA512 0860d1f5fca7b1345870e866d7bb78f14672c5bb63c56bb04360ee891be542b4b56625ab971ef9b304b792b6cf36c9508bfd812c4a133f6ba8bafdde5e2f8fcf
+    URLS "https://github.com/Microsoft/openssl/archive/OpenSSL_1_0_2k_WinRT.zip"
+    FILENAME "openssl-microsoft-1.0.2k_WinRT.zip"
+    SHA512 afb434ef69c399f690f7ce723fabb228f77a12428f19062c5df3b8b841a2a7881c01150fdcfd2fab23867e3963292874a08ad227b37d168907b507fb1d7fede7
 )
 
 vcpkg_extract_source_archive(${ARCHIVE})
@@ -45,10 +45,6 @@ file(REMOVE_RECURSE ${SOURCE_PATH}/out32dll)
 file(REMOVE_RECURSE ${SOURCE_PATH}/inc32dll)
 
 file(COPY
-${CMAKE_CURRENT_LIST_DIR}/setVSvars.bat
-DESTINATION ${SOURCE_PATH}/ms)
-
-file(COPY
 ${CMAKE_CURRENT_LIST_DIR}/make-openssl.bat
 DESTINATION ${SOURCE_PATH})
 
diff --git a/ports/openssl/setVSvars.bat b/ports/openssl/setVSvars.bat
deleted file mode 100644
index e6ebc0a7d..000000000
--- a/ports/openssl/setVSvars.bat
+++ /dev/null
@@ -1,185 +0,0 @@
-@echo off
-call:set_%1
-exit /b
-:set_universal10.0Win32
-	call:setVar _VS14VC VisualStudio14VC
-	call "%_VS14VC%vcvarsall" x86 store
-	set _VCPlatform=x86
-	set _VCLibPlat=
-	call:setEnv
-	goto :eof
-
-:set_universal10.0x64
-	call:setVar _VS14VC VisualStudio14VC
-	call "%_VS14VC%vcvarsall" x64 store
-	set _VCPlatform=x64
-	set _VCLibPlat=amd64
-	call:setEnv
-	goto :eof
-
-:set_universal10.0arm
-	call:setVar _VS14VC VisualStudio14VC
-	call "%_VS14VC%vcvarsall" x86_arm store
-	set _VCPlatform=ARM
-	set _VCLibPlat=ARM
-	call:setEnv
-	goto :eof
-
-:set_universal10.0arm64
-	call:setVar _VS14VC VisualStudio14VC
-	call "%_VS14VC%vcvarsall" x86_arm64 store
-	set _VCPlatform=ARM64
-	set _VCLibPlat=ARM64
-	call:setEnv
-	goto :eof
-
-:set_wp8.1arm
-	call:setVar _VS12VC VisualStudio12VC
-	call:setVar _WPKITS81 WindowsPhoneKits8.1
-	call:setVar _VS14VC VisualStudio14VC
-	call "%_VS12VC%\vcvarsall" x86_arm
-	set PATH=%_VS12VC\Bin%;%PATH%
-	set INCLUDE=%_WPKITS81%\Include;%_WPKITS81%\Include\abi;%_WPKITS81%\Include\mincore;%_WPKITS81%\Include\minwin;%_WPKITS81%\Include\wrl;%INCLUDE%
-	set LIB=%_WPKITS81%\lib\ARM;%_VS12VC%\lib\store\ARM;
-	set LIBPATH=%LIBPATH%;%_VS12VC%\vcpackages;%WindowsSDK_ExecutablePath_x86%\..\..\Tools\MDILXAPCompile\WinMDs;%_VS14VC%\vcpackages;
-	goto :eof
-
-:set_wp8.1Win32
-	call:setVar _VS12VC VisualStudio12VC
-	call:setVar _WPKITS81 WindowsPhoneKits8.1
-	call:setVar _VS14VC VisualStudio14VC
-	call "%_VS12VC%\vcvarsall" x86
-	set INCLUDE=%_WPKITS81%\Include;%_WPKITS81%\Include\abi;%_WPKITS81%\Include\mincore;%_WPKITS81%\Include\minwin;%_WPKITS81%\Include\wrl;%INCLUDE%
-	set LIB=%_WPKITS81%\lib\x86;%_VS12VC%\lib\store;
-	set LIBPATH=%LIBPATH%;%_VS12VC%\vcpackages;%WindowsSDK_ExecutablePath_x86%\..\..\Tools\MDILXAPCompile\WinMDs;%_VS14VC%\vcpackages;
-	goto :eof
-
-:set_wp8.0arm
-	call:setVar _VS11VC VisualStudio11VC
-	call:setVar _WPKITS80 WindowsPhoneKits8.0
-	call "%_VS11VC%\WPSDK\WP80\vcvarsphoneall.bat" x86_arm
-	goto :eof
-
-:set_wp8.0Win32
-	call:setVar _VS11VC VisualStudio11VC
-	call:setVar _WPKITS80 WindowsPhoneKits8.0
-	call "%_VS11VC%\WPSDK\WP80\vcvarsphoneall.bat" x86
-	goto :eof
-
-:set_ws8.1Win32
-	call:setVar _VS12VC VisualStudio12VC
-	call:setVar _WSKITS81 WindowsKits8.1
-	call:setVar _VS14VC VisualStudio14VC
-	call "%_VS12VC%\vcvarsall" x86
-	set INCLUDE=%_VS12VC%\include;%_VS12VC%\atlmfc\include;%_WSKITS81%\Include\um;%_WSKITS81%\Include\shared;%_WSKITS81%\Include\winrt;
-	set LIB=%_VS12VC%\lib\store;%_VS12VC%\atlmfc\lib;%_WSKITS81%\lib\winv6.3\um\x86;
-	set LIBPATH=%_WSKITS81%\References\CommonConfiguration\Neutral;%_VS12VC%\atlmfc\lib;%_VS12VC%\lib\store;%_VS12VC%\vcpackages;%WindowsSDK_ExecutablePath_x86%\..\..\Tools\MDILXAPCompile\WinMDs;%_VS14VC%\vcpackages;
-	goto :eof
-
-:set_ws8.1x64
-	call:setVar _VS12VC VisualStudio12VC
-	call:setVar _WSKITS81 WindowsKits8.1
-	call:setVar _VS14VC VisualStudio14VC
-	call "%_VS12VC%\vcvarsall" x64
-	set INCLUDE=%_VS12VC%\include;%_VS12VC%\atlmfc\include;%_WSKITS81%\Include\um;%_WSKITS81%\Include\shared;%_WSKITS81%\Include\winrt;
-	set LIB=%_VS12VC%\lib\store\amd64;%_VS12VC%\atlmfc\lib\amd64;%_WSKITS81%\lib\winv6.3\um\x64;
-	set LIBPATH=%_WSKITS81%\References\CommonConfiguration\Neutral;%_VS12VC%\atlmfc\lib\amd64;%_VS12VC%\lib\store;%_VS12VC%\vcpackages;%WindowsSDK_ExecutablePath_x86%\..\..\Tools\MDILXAPCompile\WinMDs;%_VS14VC%\vcpackages;
-	goto :eof
-
-:set_ws8.1arm
-	call:setVar _VS12VC VisualStudio12VC
-	call:setVar _WSKITS81 WindowsKits8.1
-	call:setVar _VS14VC VisualStudio14VC
-	call "%_VS12VC%\vcvarsall" x86_arm
-	set INCLUDE=%_VS12VC%\include;%_VS12VC%\atlmfc\include;%_WSKITS81%\Include\um;%_WSKITS81%\Include\shared;%_WSKITS81%\Include\winrt;
-	set LIB=%_VS12VC%\lib\store\arm;%_VS12VC%\atlmfc\lib\arm;%_WSKITS81%\lib\winv6.3\um\arm;
-	set LIBPATH=%_WSKITS81%\References\CommonConfiguration\Neutral;%_VS12VC%\atlmfc\lib\arm;%_VS12VC%\lib\store;%_VS12VC%\vcpackages;%WindowsSDK_ExecutablePath_x86%\..\..\Tools\MDILXAPCompile\WinMDs;%_VS14VC%\vcpackages;
-	goto :eof
-
-:setVar
-	call:set%1
-	if "!%1!"=="" echo warning: could not locate %2
-	goto :eof
-
-:setRegVar
-	for /F "usebackq tokens=2*" %%A IN (`reg query %1 /v %2 2^>nul`) do (
-	set %3=%%B
-	)
-	goto :eof
-
-:setAppend
-	if exist %1%2 set %3=%1%2
-	goto :eof
-
-:set_VS11VC
-	if not "%_VS11VC%"=="" goto :eof
-	call:setRegVar "HKEY_CURRENT_USER\Software\Microsoft\VisualStudio\11.0_Config\Setup\VC" ProductDir _VS11VC
-	if not "%_VS11VC%"=="" goto :eof
-	call:setRegVar "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\11.0\Setup\VC" ProductDir _VS11VC
-	if not "%_VS11VC%"=="" goto :eof
-	call:setAppend VSSDK110Install \..\VC _VS11VC
-	if not "%_VS11VC%"=="" goto :eof
-	call:setAppend VS110COMNTOOLS \..\..\VC _VS11VC
-	goto :eof
-
-:set_VS12VC
-	if not "%_VS12VC%"=="" goto :eof
-	call:setRegVar "HKEY_CURRENT_USER\Software\Microsoft\VisualStudio\12.0_Config\Setup\VC" ProductDir _VS12VC
-	if not "%_VS12VC%"=="" goto :eof
-	call:setRegVar "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\12.0\Setup\VC" ProductDir _VS12VC
-	if not "%_VS12VC%"=="" goto :eof
-	call:setAppend VSSDK120Install \..\VC _VS12VC
-	if not "%_VS12VC%"=="" goto :eof
-	call:setAppend VS120COMNTOOLS \..\..\VC _VS12VC
-	goto :eof
-
-:set_VS14VC
-	if not "%_VS14VC%"=="" goto :eof
-	call:setRegVar "HKEY_CURRENT_USER\Software\Microsoft\VisualStudio\14.0_Config\Setup\VC" ProductDir _VS14VC
-	if not "%_VS14VC%"=="" goto :eof
-	call:setRegVar "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\Setup\VC" ProductDir _VS14VC
-	if not "%_VS14VC%"=="" goto :eof
-	call:setAppend VSSDK140Install \..\VC _VS14VC
-	if not "%_VS14VC%"=="" goto :eof
-	call:setAppend VS140COMNTOOLS \..\..\VC _VS14VC
-	goto :eof
-
-:set_WPKITS80
-	if not "%_WPKITS80%"=="" goto :eof
-	call:setRegVar "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows Phone\v8.0" InstallationFolder _WPKITS80
-	if not "%_WPKITS80%"=="" goto :eof
-	goto :eof
-
-:set_WPKITS81
-	if not "%_WPKITS81%"=="" goto :eof
-	call:setRegVar "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows Phone\v8.1" InstallationFolder _WPKITS81
-	if not "%_WPKITS81%"=="" goto :eof
-	goto :eof
-
-:set_WSKITS81
-	if not "%_WSKITS81%"=="" goto :eof
-	call:setRegVar "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots" KitsRoot81 _WSKITS81
-	if not "%_WSKITS81%"=="" goto :eof
-	goto :eof
-
-:set_WKITS10
-	if not "%_WKITS10%"=="" goto :eof
-	call:setRegVar "HKLM\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0" InstallationFolder _WKITS10
-	if not "%_WKITS10%"=="" goto :eof
-	goto :eof
-
-:set_WKITS10VER
-	if not "%_WKITS10VER%"=="" goto :eof
-	call:setRegVar "HKLM\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0" ProductVersion _WKITS10VER
-	echo %_WKITS10VER%
-	if not "%_WKITS10VER%"=="" goto :eof
-	goto :eof
-
-:setEnv
-	call:setVar _VS14VC VisualStudio14VC
-	call:setVar _WKITS10 WindowsKits10.0
-	set PATH=%_VS14VCBin%;%PATH%
-	set "LIBPATH=%_WKITS10%UnionMetadata\Facade;%_VS14VC%vcpackages;%_WKITS10%references\windows.foundation.foundationcontract\1.0.0.0\;%_WKITS10%references\windows.foundation.universalapicontract\1.0.0.0\"
-	goto :eof
-
-:end