[xmltooling] 15/24: Remove old c14n API dependencies.

[Etienne Dysli Metref]

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

edm-guest pushed a commit to branch master
in repository xmltooling.

commit 84e5673ba0f85f483b0b19477ad6592ecc903c82
Author: Scott Cantor <cantor.2 at osu.edu>
Date:   Wed Dec 13 16:49:04 2017 -0500

    Remove old c14n API dependencies.
---
 xmltooling/signature/impl/XMLSecSignatureImpl.cpp | 2 +-
 xmltooling/util/ReloadableXMLFile.cpp             | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/xmltooling/signature/impl/XMLSecSignatureImpl.cpp b/xmltooling/signature/impl/XMLSecSignatureImpl.cpp
index 6fa1f50..b40d9c5 100644
--- a/xmltooling/signature/impl/XMLSecSignatureImpl.cpp
+++ b/xmltooling/signature/impl/XMLSecSignatureImpl.cpp
@@ -90,7 +90,7 @@ namespace xmlsignature {
         // Getters
         const XMLCh* getCanonicalizationMethod() const {
             if (m_signature)
-                return canonicalizationMethod2UNICODEURI(m_signature->getCanonicalizationMethod());
+                return m_signature->getCanonicalizationMethod();
             return m_c14n ? m_c14n : DSIGConstants::s_unicodeStrURIEXC_C14N_NOC;
         }
         const XMLCh* getSignatureAlgorithm() const {
diff --git a/xmltooling/util/ReloadableXMLFile.cpp b/xmltooling/util/ReloadableXMLFile.cpp
index 3e0ae89..d296ca8 100644
--- a/xmltooling/util/ReloadableXMLFile.cpp
+++ b/xmltooling/util/ReloadableXMLFile.cpp
@@ -581,12 +581,9 @@ void ReloadableXMLFile::validateSignature(Signature& sigObj) const
                         if (dynamic_cast<const DSIGTransformEnvelope*>(t)) {
                             valid=true;
                         }
-                        else {
-                            const DSIGTransformC14n* ct = dynamic_cast<const DSIGTransformC14n*>(t);
-                            if (!ct || ct->getCanonicalizationMethod() == CANON_NONE) {
-                                valid = false;
-                                break;
-                            }
+                        else if (!dynamic_cast<const DSIGTransformC14n*>(t)) {
+                            valid = false;
+                            break;
                         }
                     }
                 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/xmltooling.git