[cpp-sp] branch master updated: SSPCPP-805 - Change default signing algorithms to SHA-256

[Scott Cantor]

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

scantor 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=d239d54c692479deff9aeb9b5a326a69b2f7115f

The following commit(s) were added to refs/heads/master by this push:
       new  d239d54   SSPCPP-805 - Change default signing algorithms to SHA-256
d239d54 is described below

commit d239d54c692479deff9aeb9b5a326a69b2f7115f
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu May 24 17:59:09 2018 -0400

    SSPCPP-805 - Change default signing algorithms to SHA-256
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-805
    
    Revise SHA-2 detection logic to leverage underlying lib.
    Conditionalize algorithms in metadata.
---
 shibsp/handler/impl/MetadataGenerator.cpp | 13 +++++++++----
 shibsp/internal.h                         |  2 ++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/shibsp/handler/impl/MetadataGenerator.cpp b/shibsp/handler/impl/MetadataGenerator.cpp
index 7bbecac..938253d 100644
--- a/shibsp/handler/impl/MetadataGenerator.cpp
+++ b/shibsp/handler/impl/MetadataGenerator.cpp
@@ -327,30 +327,35 @@ MetadataGenerator::MetadataGenerator(const DOMElement* e, const char* appId)
     }
 
     if (m_digests.empty()) {
+#ifdef XSEC_OPENSSL_HAVE_SHA2
         registerDigestMethod(DSIGConstants::s_unicodeStrURISHA512);
         registerDigestMethod(DSIGConstants::s_unicodeStrURISHA384);
         registerDigestMethod(DSIGConstants::s_unicodeStrURISHA256);
         registerDigestMethod(DSIGConstants::s_unicodeStrURISHA224);
+#endif
         registerDigestMethod(DSIGConstants::s_unicodeStrURISHA1);
     }
 
     if (m_signings.empty()) {
-#ifdef XSEC_OPENSSL_HAVE_EC
+#ifdef XSEC_OPENSSL_HAVE_SHA2
+# ifdef XSEC_OPENSSL_HAVE_EC
         registerSigningMethod(DSIGConstants::s_unicodeStrURIECDSA_SHA512);
         registerSigningMethod(DSIGConstants::s_unicodeStrURIECDSA_SHA384);
         registerSigningMethod(DSIGConstants::s_unicodeStrURIECDSA_SHA256);
-# ifdef URI_ID_ECDSA_SHA224
+#  ifdef URI_ID_ECDSA_SHA224
         registerSigningMethod(DSIGConstants::s_unicodeStrURIECDSA_SHA224);
+#  endif
 # endif
-#endif
         registerSigningMethod(DSIGConstants::s_unicodeStrURIRSA_SHA512);
         registerSigningMethod(DSIGConstants::s_unicodeStrURIRSA_SHA384);
         registerSigningMethod(DSIGConstants::s_unicodeStrURIRSA_SHA256);
 
-#ifdef URI_ID_DSA_SHA256
+# ifdef URI_ID_DSA_SHA256
         registerSigningMethod(DSIGConstants::s_unicodeStrURIDSA_SHA256);
+# endif
 #endif
 
+
 #ifdef XSEC_OPENSSL_HAVE_EC
         registerSigningMethod(DSIGConstants::s_unicodeStrURIECDSA_SHA1);
 #endif
diff --git a/shibsp/internal.h b/shibsp/internal.h
index c35cccf..092332b 100644
--- a/shibsp/internal.h
+++ b/shibsp/internal.h
@@ -32,6 +32,8 @@
 #ifdef WIN32
 # define _CRT_SECURE_NO_DEPRECATE 1
 # define _CRT_NONSTDC_NO_DEPRECATE 1
+# define _SCL_SECURE_NO_WARNINGS 1
+# define XSEC_HAVE_OPENSSL 1
 #endif
 
 // Export public APIs

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