X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2FSAMLConfig.cpp;h=cfecf0cf265be17e4305db35d6bbc10ad116825c;hb=a30857e2c0f4bcd1817aa2939ffdc0856e93a533;hp=ef24319975e37d6988ac5c84fd124095bbbee69f;hpb=1bc8e721db3a50294df852662e1eddcdbdae8f9f;p=shibboleth%2Fcpp-opensaml.git

diff --git a/saml/SAMLConfig.cpp b/saml/SAMLConfig.cpp
index ef24319..cfecf0c 100644
--- a/saml/SAMLConfig.cpp
+++ b/saml/SAMLConfig.cpp
@@ -34,7 +34,6 @@
 #include "saml2/core/Protocols.h"
 #include "saml2/metadata/Metadata.h"
 #include "saml2/metadata/MetadataProvider.h"
-#include "security/TrustEngine.h"
 #include "util/SAMLConstants.h"
 
 #include <xmltooling/XMLToolingConfig.h>
@@ -122,7 +121,6 @@ bool SAMLInternalConfig::init(bool initXMLTooling)
     saml2md::registerMetadataProviders();
     saml2md::registerMetadataFilters();
     registerSAMLArtifacts();
-    registerTrustEngines();
     registerMessageEncoders();
     registerMessageDecoders();
     registerSecurityPolicyRules();
@@ -142,7 +140,6 @@ void SAMLInternalConfig::term(bool termXMLTooling)
 
     MessageDecoderManager.deregisterFactories();
     MessageEncoderManager.deregisterFactories();
-    TrustEngineManager.deregisterFactories();
     SecurityPolicyRuleManager.deregisterFactories();
     SAMLArtifactManager.deregisterFactories();
     MetadataFilterManager.deregisterFactories();
@@ -199,9 +196,8 @@ string SAMLInternalConfig::hashSHA1(const char* s, bool toHex)
 
     auto_ptr<XSECCryptoHash> hasher(XSECPlatformUtils::g_cryptoProvider->hashSHA1());
     if (hasher.get()) {
-        auto_ptr<char> dup(strdup(s));
         unsigned char buf[21];
-        hasher->hash(reinterpret_cast<unsigned char*>(dup.get()),strlen(dup.get()));
+        hasher->hash(reinterpret_cast<unsigned char*>(const_cast<char*>(s)),strlen(s));
         if (hasher->finish(buf,20)==20) {
             string ret;
             if (toHex) {