[cpp-msbuild] 01/01: SSPCPP-1021 Migrate Windows build to OpenSSL 3.5

[Codeberg]

This is an automated email from the git hooks/post-receive script.

codeberg pushed a commit to branch dev/SSPCPP-1021
in repository cpp-msbuild.

View the commit online:
https://codeberg.org/Shibboleth/cpp-msbuild/commit/c6ae24784378f26468a04898de99cc96fc42a201

commit c6ae24784378f26468a04898de99cc96fc42a201
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Apr 19 10:51:40 2026 +0100

    SSPCPP-1021 Migrate Windows build to OpenSSL 3.5
    
    https://shibboleth.atlassian.net/browse/SSPCPP-1021
---
 Versions.props          | 26 +++++++++++++-------------
 dependencies/config.bat | 10 +++++-----
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Versions.props b/Versions.props
index a66a13b..476e2dd 100644
--- a/Versions.props
+++ b/Versions.props
@@ -12,7 +12,7 @@
 
     <!-- These control the version of the installer -->
     <ShibbolethVersion>3.5.2</ShibbolethVersion>
-    <ShibbolethPatchVersion>3</ShibbolethPatchVersion>
+    <ShibbolethPatchVersion>4</ShibbolethPatchVersion>
 
     <!-- These control the versions in the DLLs and Executables.
          Note that the PatchVersion is left to the individual resource file.
@@ -111,29 +111,29 @@
 
   <PropertyGroup Label="OpenSSLGeneral">
     <!-- Just for now -->
-    <OPENSSL_FILE_VERSION Condition="'$(OPENSSL_FILE_VERSION)' == ''">3_3</OPENSSL_FILE_VERSION>
+    <OPENSSL_FILE_VERSION Condition="'$(OPENSSL_FILE_VERSION)' == ''">3_5</OPENSSL_FILE_VERSION>
 
-    <openssl Condition="'$(OPENSSL_DIR)'==''">openssl-3.3.7</openssl>
+    <openssl Condition="'$(OPENSSL_DIR)'==''">openssl-3.5.6</openssl>
     <openssl Condition="'$(OPENSSL_DIR)'!=''">$(OPENSSL_DIR)</openssl>
   </PropertyGroup>
 
-  <PropertyGroup Label="OpenSSLGuidsBad" Condition="'$(OPENSSL_FILE_VERSION)' != '3_3'">
+  <PropertyGroup Label="OpenSSLGuidsBad" Condition="'$(OPENSSL_FILE_VERSION)' != '3_5'">
     <!--- If you revert to a pre-V3.0 version of OpenSSL you need to change the name of the 
           License file in cpp-sp/msi/WiX/MergeModules/OpenSSL-x64/x86.wxs -->
     <OpenSSLFileVersion>BAD_OPENSSL_FILE_VERSION</OpenSSLFileVersion>
     <!-- Changing OPENSSL_FILE_VERSION version requires changing the GUIDs since it is garnish on the name -->
   </PropertyGroup>
-  <PropertyGroup Label="OpenSSLGuids" Condition="'$(OPENSSL_FILE_VERSION)' == '3_3'">
+  <PropertyGroup Label="OpenSSLGuids" Condition="'$(OPENSSL_FILE_VERSION)' == '3_5'">
     <OpenSSLFileVersion>$(OPENSSL_FILE_VERSION)</OpenSSLFileVersion>
     <!-- Change the 8 components below iff OpenSSLFileVersion changes -->
-    <LibEay32Component>{9EE1483E-C7E2-4319-8D0C-273FC7C719A8}</LibEay32Component>
-    <SSlEay32Component>{C5DF1F38-175C-4899-B026-A52361023E68}</SSlEay32Component>
-    <LibEay32Componentd>{F0D4FE91-E9CB-427E-B595-6CA321CDBD25}</LibEay32Componentd>
-    <SSlEay32Componentd>{9DB60090-5CAF-4843-8C44-76E39B2F0648}</SSlEay32Componentd>
-    <LibEay64Component>{CE5FC218-4F96-4B92-99F4-19B5EA5C4F15}</LibEay64Component>
-    <SSlEay64Component>{66E8A5FA-7B6E-4B3F-8A7D-7DF4E648F33F}</SSlEay64Component>
-    <LibEay64Componentd>{0DF18F0A-F492-4701-B289-B43856B24577}</LibEay64Componentd>
-    <SSlEay64Componentd>{D2C51528-6C12-4620-9A76-3946D076BBC3}</SSlEay64Componentd>
+    <LibEay32Component>{FFBBFCB0-41ED-4378-B50A-49B47E96E946}</LibEay32Component>
+    <SSlEay32Component>{F42D207A-0DC9-45F1-911D-01B0656BB029}</SSlEay32Component>
+    <LibEay32Componentd>{FCDB6796-8B56-4E7B-B277-20A9D75AC7B1}</LibEay32Componentd>
+    <SSlEay32Componentd>{76B7CB3C-57AE-4F62-994D-F58641F958E5}</SSlEay32Componentd>
+    <LibEay64Component>{58D4006F-39FA-4937-B421-FDB3FAB8EF07}</LibEay64Component>
+    <SSlEay64Component>{F586A480-E4D4-4374-ACF2-34AAB21D7CAC}</SSlEay64Component>
+    <LibEay64Componentd>{2CA4A081-5128-47E2-8DB3-E6890E0C819B}</LibEay64Componentd>
+    <SSlEay64Componentd>{E5BA90F7-A168-414B-A789-D368056B2F82}</SSlEay64Componentd>
   </PropertyGroup>
 
   <PropertyGroup Label="XSecGeneral">
diff --git a/dependencies/config.bat b/dependencies/config.bat
index c617328..6f91c09 100644
--- a/dependencies/config.bat
+++ b/dependencies/config.bat
@@ -47,13 +47,13 @@ SET APACHE_24_ROOT64=C:\Apache24-64
 goto path_done
 
 :ROD
-set ROOT_DIR=v:\Perforce\VS2017\
+set ROOT_DIR=h:\Perforce\VS2017\
 set SED=c:\cygwin64\bin\sed.exe
 REM CPP_MM_DIR need not be set if vcvars is called prior to loading Visual studio or running msbuild
 rem set CPP_MM_DIR=D:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Redist\MSVC\14.14.26405\MergeModules
 set DEBUG_INSTALLER=YES
 set PERL=c:\Strawberry\perl\bin\perl.exe
-set PATH=%PATH%;D:\Downloads\nasm-2.13.01\
+set PATH=%PATH%;D:\Downloads\nasm-3.01\
 
 REM
 REM Apache Config
@@ -93,9 +93,9 @@ REM OPENSSL_DIR          is the directory name
 REM OPENSSL_MM_VERSION   is the Merge Module version (and so have to be 3 or 4 dot separated numbers)
 REM OPENSSL_FILE_VERSION is the distinction on the name of the DLLS
 REM                      if it changes you *MUST* change Version.props
-set OPENSSL_DIR=openssl-3.3.7
-set OPENSSL_MM_VERSION=3.3.7.0
-set OPENSSL_FILE_VERSION=3_3
+set OPENSSL_DIR=openssl-3.5.6
+set OPENSSL_MM_VERSION=3.5.6.0
+set OPENSSL_FILE_VERSION=3_5
 
 REM
 REM CURL CONFIG

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.