[cpp-sp COMMIT] /branches/REL_2/shibsp/handler/impl/MetadataGenerator.cpp

[noreply at shibboleth.net]

Author: scantor
Date: Mon Aug 13 22:45:08 2012
New Revision: 3759

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3759&view=rev
Log:
https://issues.shibboleth.net/jira/browse/SSPCPP-492

Modified:
    branches/REL_2/shibsp/handler/impl/MetadataGenerator.cpp

Modified: branches/REL_2/shibsp/handler/impl/MetadataGenerator.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/handler/impl/MetadataGenerator.cpp?rev=3759&r1=3758&r2=3759&view=diff
==============================================================================
--- branches/REL_2/shibsp/handler/impl/MetadataGenerator.cpp (original)
+++ branches/REL_2/shibsp/handler/impl/MetadataGenerator.cpp Mon Aug 13 22:45:08 2012
@@ -109,8 +109,11 @@
                 em->setAlgorithm(alg);
                 m_encryptions.push_back(em);
 
-                if (XMLString::equals(alg, DSIGConstants::s_unicodeStrURIRSA_OAEP) ||
-                        XMLString::equals(alg, DSIGConstants::s_unicodeStrURIRSA_OAEP_MGFP1)) {
+                if (
+#ifdef URI_ID_RSA_OAEP
+                    XMLString::equals(alg, DSIGConstants::s_unicodeStrURIRSA_OAEP) ||
+#endif
+                    XMLString::equals(alg, DSIGConstants::s_unicodeStrURIRSA_OAEP_MGFP1)) {
                     // Check for non-support of SHA-256. This is a reasonable guess as to whether
                     // "all" standard digests and MGF variants will be supported or not, and if not, we
                     // explicitly advertise only SHA-1.
@@ -118,12 +121,14 @@
                         if (!m_digestBuilder)
                             m_digestBuilder = XMLObjectBuilder::getBuilder(xmltooling::QName(samlconstants::SAML20MD_ALGSUPPORT_NS, DigestMethod::LOCAL_NAME));
                         
+#ifdef URI_ID_RSA_OAEP
                         // Add MGF for new OAEP variant.
                         if (XMLString::equals(alg, DSIGConstants::s_unicodeStrURIRSA_OAEP)) {
                             MGF* mgf = MGFBuilder::buildMGF();
                             mgf->setAlgorithm(DSIGConstants::s_unicodeStrURIMGF1_SHA1);
                             em->getUnknownXMLObjects().push_back(mgf);
                         }
+#endif
 
                         DigestMethod* dm = dynamic_cast<DigestMethod*>(
                             m_digestBuilder->buildObject(xmlconstants::XMLSIG_NS, DigestMethod::LOCAL_NAME, xmlconstants::XMLSIG_PREFIX)