[cpp-msbuild] branch master updated: Update OpenSSL to 1.1.1e and rename files.

[Scott Cantor]

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

scantor 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=8400fdefb9034a166233d445a38512e49ecdb44d

The following commit(s) were added to refs/heads/master by this push:
       new  8400fde   Update OpenSSL to 1.1.1e and rename files.
8400fde is described below

commit 8400fdefb9034a166233d445a38512e49ecdb44d
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Mar 23 14:24:28 2020 -0400

    Update OpenSSL to 1.1.1e and rename files.
---
 Versions.props          | 24 ++++++++++++------------
 dependencies/config.bat |  8 ++++----
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Versions.props b/Versions.props
index 3c200f5..c0cdea5 100644
--- a/Versions.props
+++ b/Versions.props
@@ -112,27 +112,27 @@
 
   <PropertyGroup Label="OpenSSLGeneral">
     <!-- Just for now -->
-    <OPENSSL_FILE_VERSION Condition="'$(OPENSSL_FILE_VERSION)' == ''">1_1_1</OPENSSL_FILE_VERSION>
+    <OPENSSL_FILE_VERSION Condition="'$(OPENSSL_FILE_VERSION)' == ''">1_1_1_5</OPENSSL_FILE_VERSION>
 
-    <openssl Condition="'$(OPENSSL_DIR)'==''">openssl-1.1.1a</openssl>
+    <openssl Condition="'$(OPENSSL_DIR)'==''">openssl-1.1.1e</openssl>
     <openssl Condition="'$(OPENSSL_DIR)'!=''">$(OPENSSL_DIR)</openssl>
   </PropertyGroup>
 
-  <PropertyGroup Label="OpenSSLGuidsBad" Condition="'$(OPENSSL_FILE_VERSION)' != '1_1_1'">
+  <PropertyGroup Label="OpenSSLGuidsBad" Condition="'$(OPENSSL_FILE_VERSION)' != '1_1_1_5'">
     <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'">
+  <PropertyGroup Label="OpenSSLGuids" Condition="'$(OPENSSL_FILE_VERSION)' == '1_1_1_5'">
     <OpenSSLFileVersion>$(OPENSSL_FILE_VERSION)</OpenSSLFileVersion>
     <!-- Change the 8 components below iff OpenSSLFileVersion changes -->
-    <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>
+    <LibEay32Component>{8AABC12C-75FB-4A43-99A9-0F173820C1FD}</LibEay32Component>
+    <SSlEay32Component>{9548E1CF-88CF-4E7B-8E8B-41FC89A40386}</SSlEay32Component>
+    <LibEay32Componentd>{4D6B0CB1-3482-48A0-BB02-2A50A8862C55}</LibEay32Componentd>
+    <SSlEay32Componentd>{2FDB80A2-9217-4E17-AAB1-338562B6A373}</SSlEay32Componentd>
+    <LibEay64Component>{07057DA7-13BA-4011-876D-A3568B5D9899}</LibEay64Component>
+    <SSlEay64Component>{2AADE8B3-C07F-4069-8FAA-CFF9DBCF74A9}</SSlEay64Component>
+    <LibEay64Componentd>{A6F3C217-33DD-4677-9D21-BB6D0F17B6F5}</LibEay64Componentd>
+    <SSlEay64Componentd>{69046336-38C0-4B94-966D-ECB7E196A933}</SSlEay64Componentd>
   </PropertyGroup>
 
   <PropertyGroup Label="XSecGeneral">
diff --git a/dependencies/config.bat b/dependencies/config.bat
index b5b7011..31dd5c6 100644
--- a/dependencies/config.bat
+++ b/dependencies/config.bat
@@ -11,7 +11,7 @@ set ROOT_DIR=C:\Users\scantor\Shibboleth\
 
 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=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.14.26405\MergeModules
-set SED=C:\cygwin64\bin\sed.exe
+set SED="C:\Program Files\Git\usr\bin\sed.exe"
 rem set DEBUG_INSTALLER=YES
 
 REM
@@ -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.1d
-set OPENSSL_MM_VERSION=1.1.1.4
-set OPENSSL_FILE_VERSION=1_1_1
+set OPENSSL_DIR=openssl-1.1.1e
+set OPENSSL_MM_VERSION=1.1.1.5
+set OPENSSL_FILE_VERSION=1_1_1_5
 
 REM
 REM CURL CONFIG

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