[cpp-sp] branch master updated: SSPCPP-689 OpenSSL1.1 Build and Merge Modules

[Rod Widdowson]

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

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

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

The following commit(s) were added to refs/heads/master by this push:
       new  e96a4c9   SSPCPP-689 OpenSSL1.1 Build and Merge Modules
e96a4c9 is described below

commit e96a4c96c67b48e25c7f0283ebf386c330fc242c
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jul 11 12:41:31 2017 +0100

    SSPCPP-689 OpenSSL1.1 Build and Merge Modules
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-689
    
    Fix bug in original work to support old and new DLL names
---
 msi/WiX/MergeModules/OpenSSL-x86.wxs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msi/WiX/MergeModules/OpenSSL-x86.wxs b/msi/WiX/MergeModules/OpenSSL-x86.wxs
index a4cde2b..2e37936 100644
--- a/msi/WiX/MergeModules/OpenSSL-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x86.wxs
@@ -32,7 +32,7 @@
 <?define LibEay="libeay32_$(var.OpenSSLFileVersion).dll"?>
 <?define LibEayD="libeay32_$(var.OpenSSLFileVersion)D.dll"?>
 <?define SslEay="ssleay32_$(var.OpenSSLFileVersion).dll"?>
-<?define SslEayD="ssleay32_$(var.OpenSSLFileVersion).dll"?>
+<?define SslEayD="ssleay32_$(var.OpenSSLFileVersion)D.dll"?>
 
 <?endif ?>
 

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