[cpp-msbuild] 02/03: CPPXT-137 Bump OpenSSL to 1.1.1 and libcurl to 7.62.0

[Rod Widdowson]

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

rdw pushed a commit to branch master
in repository cpp-msbuild.

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

commit 673dffcab0a94a71f302641452aa90092cca5704
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Oct 13 14:30:50 2018 +0100

    CPPXT-137  Bump OpenSSL to 1.1.1 and libcurl to 7.62.0
    
    https://issues.shibboleth.net/jira/browse/CPPXT-137
---
 Versions.props          | 26 +++++++++++++-------------
 dependencies/config.bat | 10 +++++-----
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Versions.props b/Versions.props
index a1b81b6..b704cc5 100644
--- a/Versions.props
+++ b/Versions.props
@@ -38,7 +38,7 @@
 
     <boost>boost_1_67_0</boost>
     
-    <OpenSAMLVersion>3.0.0</OpenSAMLVersion>
+    <OpenSAMLVersion>3.0.1</OpenSAMLVersion>
     <OpenSAMLFileVersion>3_0</OpenSAMLFileVersion>
     <!-- Change the 4 components below iff the OpenSAMLFileVersion name changes -->
     <SamlComponent32>{3444DBA9-C1E9-4F64-83AB-8C808E783F38}</SamlComponent32>
@@ -46,7 +46,7 @@
     <SamlComponent64>{E935A801-7D01-4996-A69D-46AF25D8C817}</SamlComponent64>
     <SamlComponent64d>{C453CD74-4CAE-4506-9695-F2BF0649CD9D}</SamlComponent64d>
 
-    <XmlToolingVersion>3.0.2</XmlToolingVersion>
+    <XmlToolingVersion>3.0.3</XmlToolingVersion>
     <XmlToolingFileVersion>3_0</XmlToolingFileVersion>
     <!-- Change the 8 components below iff the XmlToolingFileVersion name changes -->
     <XMLToolingComponent32>{07395646-06CE-436E-B57A-1420924257BC}</XMLToolingComponent32>
@@ -105,27 +105,27 @@
 
   <PropertyGroup Label="OpenSSLGeneral">
     <!-- Just for now -->
-    <OPENSSL_FILE_VERSION Condition="'$(OPENSSL_FILE_VERSION)' == ''">1_1</OPENSSL_FILE_VERSION>
+    <OPENSSL_FILE_VERSION Condition="'$(OPENSSL_FILE_VERSION)' == ''">1_1_1</OPENSSL_FILE_VERSION>
 
     <openssl Condition="'$(OPENSSL_DIR)'==''">openssl-1.1.0h</openssl>
     <openssl Condition="'$(OPENSSL_DIR)'!=''">$(OPENSSL_DIR)</openssl>
   </PropertyGroup>
 
-  <PropertyGroup Label="OpenSSLGuidsBad" Condition="'$(OPENSSL_FILE_VERSION)' != '1_1_0'">
+  <PropertyGroup Label="OpenSSLGuidsBad" Condition="'$(OPENSSL_FILE_VERSION)' != '1_1_1'">
     <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_0'">
+  <PropertyGroup Label="OpenSSLGuids" Condition="'$(OPENSSL_FILE_VERSION)' == '1_1_1'">
     <OpenSSLFileVersion>$(OPENSSL_FILE_VERSION)</OpenSSLFileVersion>
     <!-- Change the 8 components below iff OpenSSLFileVersion changes -->
-    <LibEay32Component>{2F270B9B-A68A-42EC-B817-068FEFD4F36D}</LibEay32Component>
-    <SSlEay32Component>{9BF58918-75A5-4F6C-A69A-F298EE502756}</SSlEay32Component>
-    <LibEay32Componentd>{BEC421FA-33EE-4BAE-8913-61ED6CCAB5E0}</LibEay32Componentd>
-    <SSlEay32Componentd>{AF64EEAC-398D-46B5-ACC1-2AF6EC5AD043}</SSlEay32Componentd>
-    <LibEay64Component>{EC689DCE-C907-4138-B0BB-0A85312ADC18}</LibEay64Component>
-    <SSlEay64Component>{88C83F53-D6F2-4C1D-B445-FC1F431864B8}</SSlEay64Component>
-    <LibEay64Componentd>{9440BD3A-941A-4B24-A5D6-742B79681362}</LibEay64Componentd>
-    <SSlEay64Componentd>{ED3D1584-77E9-4A37-95B5-D83881A1BF44}</SSlEay64Componentd>
+    <LibEay32Component>{71ED68DD-CEF3-4DC6-AAC8-8C188B6AD6D0}</LibEay32Component>
+    <SSlEay32Component>{8806A325-FF3C-479E-B183-53F59AA709CC}</SSlEay32Component>
+    <LibEay32Componentd>{958B984A-D489-4A17-A5FE-3F13E8496D27}</LibEay32Componentd>
+    <SSlEay32Componentd>{77E2C1B7-4280-41AC-A358-FA46CE9071A2}</SSlEay32Componentd>
+    <LibEay64Component>{40243802-5AF2-40F6-BB5F-C0BE865114D0}</LibEay64Component>
+    <SSlEay64Component>{878A2513-92C6-4F1D-B64D-244172C57667}</SSlEay64Component>
+    <LibEay64Componentd>{710880C6-5F78-44FA-B463-CDCF9794298A}</LibEay64Componentd>
+    <SSlEay64Componentd>{80429F87-1CD4-457A-8891-1E163FF0F61C}</SSlEay64Componentd>
   </PropertyGroup>
 
   <PropertyGroup Label="XSecGeneral">
diff --git a/dependencies/config.bat b/dependencies/config.bat
index 949d36f..3438fce 100644
--- a/dependencies/config.bat
+++ b/dependencies/config.bat
@@ -87,9 +87,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.0h
-set OPENSSL_MM_VERSION=1.1.0.8
-set OPENSSL_FILE_VERSION=1_1_0
+set OPENSSL_DIR=openssl-1.1.1
+set OPENSSL_MM_VERSION=1.1.1.0
+set OPENSSL_FILE_VERSION=1_1_1
 
 REM
 REM CURL CONFIG
@@ -97,7 +97,7 @@ REM
 REM CURL_DIR             is the directory name
 REM CURL_VERSION         is the version
 REM
-Set LIBCURL_VERSION=7.60.0
+Set LIBCURL_VERSION=7.62.0
 set LIBCURL_DIR=curl-%LIBCURL_VERSION%
 set LIBCURL_FILE_VERSION=7
 
@@ -147,4 +147,4 @@ set SCRIPTS_DIR=%ROOT_DIR%cpp-msbuild\dependencies
 
 rem 
 rem The following is only needed if you want to run things.
-rem set path=%PATH%;%ROOT_DIR%%OPENSSL_DIR%\out32dll.dbg;%ROOT_DIR%%XERCES_DIR%\BUILD\WIN32\VC10\DEBUG;%ROOT_DIR%%XSEC_DIR%\Build\Win32\VC10\Debug No Xalan;%ROOT_DIR%%libcurl_dir%\lib\debug-dll-ssl-dll-zlib-dll;%ROOT_DIR%%LOGSHIB_DIR%\msvc10\Debug;%ROOT_DIR%%ZLIB_DIR%\Debug
+rem set path=%PATH%;%ROOT_DIR%%OPENSSL_DIR%\out32dll.dbg;%ROOT_DIR%%XERCES_DIR%\BUILD\WIN32\VC15\DEBUG;%ROOT_DIR%%XSEC_DIR%\Buildx86\Win32\VC15\Debug No Xalan;%ROOT_DIR%%libcurl_dir%\lib\debug-dll-ssl-dll-zlib-dll;%ROOT_DIR%%LOG4SHIB_DIR%\msvc15\Debug;%ROOT_DIR%%ZLIB_DIR%\Debug;%ROOT_DIR%\cpp-xmltooling\debug

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