[cpp-msbuild] branch main updated: Rev to OpenSSL 3 and Santuario 2.0.3.

Scott Cantor cantor.2 at osu.edu
Thu Oct 14 18:35:49 UTC 2021


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

scantor pushed a commit to branch main
in repository cpp-msbuild.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-msbuild.git;a=commit;h=bd64cd8c69db08d5ba466e05791f8b000bc91efc

The following commit(s) were added to refs/heads/main by this push:
     new bd64cd8  Rev to OpenSSL 3 and Santuario 2.0.3.
bd64cd8 is described below

commit bd64cd8c69db08d5ba466e05791f8b000bc91efc
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Oct 14 14:35:38 2021 -0400

    Rev to OpenSSL 3 and Santuario 2.0.3.
---
 Versions.props          | 28 ++++++++++++++--------------
 dependencies/config.bat | 10 +++++-----
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Versions.props b/Versions.props
index 126d225..31ca341 100644
--- a/Versions.props
+++ b/Versions.props
@@ -111,35 +111,35 @@
 
   <PropertyGroup Label="OpenSSLGeneral">
     <!-- Just for now -->
-    <OPENSSL_FILE_VERSION Condition="'$(OPENSSL_FILE_VERSION)' == ''">1_1_1_9</OPENSSL_FILE_VERSION>
+    <OPENSSL_FILE_VERSION Condition="'$(OPENSSL_FILE_VERSION)' == ''">3_0_0</OPENSSL_FILE_VERSION>
 
-    <openssl Condition="'$(OPENSSL_DIR)'==''">openssl-1.1.1k</openssl>
+    <openssl Condition="'$(OPENSSL_DIR)'==''">openssl-3.0.0</openssl>
     <openssl Condition="'$(OPENSSL_DIR)'!=''">$(OPENSSL_DIR)</openssl>
   </PropertyGroup>
 
-  <PropertyGroup Label="OpenSSLGuidsBad" Condition="'$(OPENSSL_FILE_VERSION)' != '1_1_1_9'">
+  <PropertyGroup Label="OpenSSLGuidsBad" Condition="'$(OPENSSL_FILE_VERSION)' != '3_0_0'">
     <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)' == '1_1_1_9'">
+  <PropertyGroup Label="OpenSSLGuids" Condition="'$(OPENSSL_FILE_VERSION)' == '3_0_0'">
     <OpenSSLFileVersion>$(OPENSSL_FILE_VERSION)</OpenSSLFileVersion>
     <!-- Change the 8 components below iff OpenSSLFileVersion changes -->
-    <LibEay32Component>{E5CDA78B-1024-4DF7-9F11-8532B6F55E21}</LibEay32Component>
-    <SSlEay32Component>{6AD1215B-E983-4823-A363-6127420408E4}</SSlEay32Component>
-    <LibEay32Componentd>{E3B837AE-B103-45F7-AC98-72BE66B76746}</LibEay32Componentd>
-    <SSlEay32Componentd>{C7454E2E-DAEA-487B-AB1C-9339E5E390C0}</SSlEay32Componentd>
-    <LibEay64Component>{6E57A83F-E67E-4E8D-B24B-ACDDFC7FDA5E}</LibEay64Component>
-    <SSlEay64Component>{73702736-2A6F-43DC-BB08-663641C1798C}</SSlEay64Component>
-    <LibEay64Componentd>{DBA7EF27-C817-43EC-B2E6-A4E945355F0A}</LibEay64Componentd>
-    <SSlEay64Componentd>{96350A7E-15DA-4CF4-B90D-F3E670AF9D36}</SSlEay64Componentd>
+    <LibEay32Component>{5546BB0E-62F2-4A6F-8BF9-E1E50E08D997}</LibEay32Component>
+    <SSlEay32Component>{A1D70FB7-8416-448F-AE19-56D832CFEE55}</SSlEay32Component>
+    <LibEay32Componentd>{818DB70F-52CD-4B41-9AB9-AEB082731D04}</LibEay32Componentd>
+    <SSlEay32Componentd>{AF96F934-79DA-4F41-BC06-A07D907FCF50}</SSlEay32Componentd>
+    <LibEay64Component>{E8FDF5CD-FB0B-4843-92EA-C0B5311C61B8}</LibEay64Component>
+    <SSlEay64Component>{8A34864F-CDE0-4C14-9BC3-4D76D1E4E6D1}</SSlEay64Component>
+    <LibEay64Componentd>{4449C2A6-0347-4FCE-A5AE-F5F4FBE63F7B}</LibEay64Componentd>
+    <SSlEay64Componentd>{264489CF-51CC-40BB-B470-0C48CAC4B7BA}</SSlEay64Componentd>
   </PropertyGroup>
 
   <PropertyGroup Label="XSecGeneral">
     <!-- Just for now -->
     <XSEC_FILE_VERSION Condition="'$(XSEC_FILE_VERSION)' == ''">2_0</XSEC_FILE_VERSION>
-    <XmlSecVersion Condition="'$(XSEC_MM_VERSION)'==''">2.0.2</XmlSecVersion>
+    <XmlSecVersion Condition="'$(XSEC_MM_VERSION)'==''">2.0.3</XmlSecVersion>
     <XmlSecVersion Condition="'$(XSEC_MM_VERSION)'!=''">$(XSEC_MM_VERSION)</XmlSecVersion>
-    <xmlsec Condition="'$(XSEC_DIR)'==''">xml-security-c-2.0.2</xmlsec>
+    <xmlsec Condition="'$(XSEC_DIR)'==''">xml-security-c-2.0.3</xmlsec>
     <xmlsec Condition="'$(XSEC_DIR)'!=''">$(XSEC_DIR)</xmlsec>
   </PropertyGroup>
 
diff --git a/dependencies/config.bat b/dependencies/config.bat
index 4931ee6..57331f3 100644
--- a/dependencies/config.bat
+++ b/dependencies/config.bat
@@ -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-1.1.1k
-set OPENSSL_MM_VERSION=1.1.1.9
-set OPENSSL_FILE_VERSION=1_1_1_9
+set OPENSSL_DIR=openssl-3.0.0
+set OPENSSL_MM_VERSION=3.0.0.0
+set OPENSSL_FILE_VERSION=3_0_0
 
 REM
 REM CURL CONFIG
@@ -114,9 +114,9 @@ REM XSEC_DIR              is the directory name
 REM XSEC_MM_VERSION       is the Merge Module version (and so have to be 3 or 4 dot separated numbers)
 REM XSEC_FILE_VERSION     is the distinction on the name of the DLLS
 REM                       if it changes you *MUST* change Version.props
-set XSEC_DIR=xml-security-c-2.0.2
+set XSEC_DIR=xml-security-c-2.0.3
 SET XSEC_FILE_VERSION=2_0
-SET XSEC_MM_VERSION=2.0.2
+SET XSEC_MM_VERSION=2.0.3
 
 REM
 REM ZLIB CONFIG

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


More information about the commits mailing list