From 4aff5e977c075f3d76e63745d6e2ab905396e643 Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Mon, 24 Feb 2025 16:48:52 -0500
Subject: [PATCH] contrib: Windows: bump openssl to 3.4.0
Gitlab: #1108
Change-Id: Ib11ddad75a421816c1a954d96c051aff4ea0d6b9
---
contrib/src/openssl/openssl-uwp.patch | 30 ---------------------------
contrib/src/openssl/package.json | 6 +++---
2 files changed, 3 insertions(+), 33 deletions(-)
delete mode 100644 contrib/src/openssl/openssl-uwp.patch
diff --git a/contrib/src/openssl/openssl-uwp.patch b/contrib/src/openssl/openssl-uwp.patch
deleted file mode 100644
index 1b33d2d54b..0000000000
--- 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 9edfda252d..b1e70b57d3 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",
--
GitLab