[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=e6271c2922db1201861ba64780a199f623b536e2

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

commit e6271c2922db1201861ba64780a199f623b536e2
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jul 11 14:48:06 2017 +0100

    SSPCPP-689 OpenSSL1.1 Build and Merge Modules
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-689
    
    The bug that keeps on giving.  Fix same buig as we had in x86 in x64.
---
 msi/WiX/MergeModules/OpenSSL-x64.wxs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msi/WiX/MergeModules/OpenSSL-x64.wxs b/msi/WiX/MergeModules/OpenSSL-x64.wxs
index 129dfd5..3d77916 100644
--- a/msi/WiX/MergeModules/OpenSSL-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x64.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.