diff --git a/contrib/src/openssl/openssl-uwp.patch b/contrib/src/openssl/openssl-uwp.patch deleted file mode 100644 index 1b33d2d54be50b5c2c08713bb611027983697052..0000000000000000000000000000000000000000 --- a/contrib/src/openssl/openssl-uwp.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/ms/setVSvars.bat -+++ b/ms/setVSvars.bat -@@ -166,7 +166,7 @@ exit /b - - :set_VS15VC - if not "%_VS15VC%"=="" goto :eof -- for /f "usebackq tokens=1* delims=: " %%i in (`%~dp0\vswhere -latest -requires Microsoft.VisualStudio.Workload.Universal -requires Microsoft.VisualStudio.ComponentGroup.UWP.VC`) do ( -+ for /f "usebackq tokens=1* delims=: " %%i in (`%~dp0\vswhere -latest -requires Microsoft.VisualStudio.Workload.Universal`) do ( - if /i "%%i"=="installationPath" set _VS15VC=%%j\VC\Auxiliary\Build - ) - if not "%_VS15VC%"=="" goto :eof ---- a/ms/winrt.cpp -+++ b/ms/winrt.cpp -@@ -291,13 +291,6 @@ extern "C" - { - return 0; - } -- -- BOOL WINAPI FlushConsoleInputBuffer( -- _In_ HANDLE hConsoleInput -- ) -- { -- return 0; -- } - BOOL DeleteDC( - _In_ HDC hdc - ) --- -2.10.2.windows.1 - diff --git a/contrib/src/openssl/package.json b/contrib/src/openssl/package.json index 9edfda252df812abdd50cb6836ae8aeab8948053..b1e70b57d399d967d8d2e37beeccdbe7fe86084c 100644 --- a/contrib/src/openssl/package.json +++ b/contrib/src/openssl/package.json @@ -1,8 +1,8 @@ { "name": "openssl", - "version": "OpenSSL_1_1_1-stable", - "cpe": "cpe:2.3:a:openssl:openssl:1.1.1:*:*:*:*:*:*:*", - "url": "https://github.com/openssl/openssl/archive/__VERSION__.tar.gz", + "version": "openssl-3.4.0", + "cpe": "cpe:2.3:a:openssl:openssl:3.4.0:*:*:*:*:*:*:*", + "url": "https://github.com/openssl/openssl/archive/refs/tags/__VERSION__.tar.gz", "custom_scripts": { "build": [ "call perl Configure no-asm no-hw no-tests /Z7 /FS VC-WIN64A",