Proper fix for method scoping.

diff --git a/xmltooling/security/OpenSSLTrustEngine.h b/xmltooling/security/OpenSSLTrustEngine.h
index f8d08bc..3218cbc 100644 (file)
--- a/xmltooling/security/OpenSSLTrustEngine.h
+++ b/xmltooling/security/OpenSSLTrustEngine.h
@@ -54,28 +54,7 @@ namespace xmltooling {
     public:
         virtual ~OpenSSLTrustEngine() {}
 
-        virtual bool validate(
-            xmlsignature::Signature& sig,
-            const CredentialResolver& credResolver,
-            CredentialCriteria* criteria=NULL
-            ) const=0;
-
-        virtual bool validate(
-            const XMLCh* sigAlgorithm,
-            const char* sig,
-            xmlsignature::KeyInfo* keyInfo,
-            const char* in,
-            unsigned int in_len,
-            const CredentialResolver& credResolver,
-            CredentialCriteria* criteria=NULL
-            ) const=0;
-
-        virtual bool validate(
-            XSECCryptoX509* certEE,
-            const std::vector<XSECCryptoX509*>& certChain,
-            const CredentialResolver& credResolver,
-            CredentialCriteria* criteria=NULL
-            ) const=0;
+        using X509TrustEngine::validate;
 
         /**
          * Determines whether an X.509 credential is valid with respect to the

diff --git a/xmltooling/security/X509TrustEngine.h b/xmltooling/security/X509TrustEngine.h
index 0d45321..329103a 100644 (file)
--- a/xmltooling/security/X509TrustEngine.h
+++ b/xmltooling/security/X509TrustEngine.h
@@ -50,21 +50,7 @@ namespace xmltooling {
     public:
         virtual ~X509TrustEngine() {}
 
-        virtual bool validate(
-            xmlsignature::Signature& sig,
-            const CredentialResolver& credResolver,
-            CredentialCriteria* criteria=NULL
-            ) const=0;
-
-        virtual bool validate(
-            const XMLCh* sigAlgorithm,
-            const char* sig,
-            xmlsignature::KeyInfo* keyInfo,
-            const char* in,
-            unsigned int in_len,
-            const CredentialResolver& credResolver,
-            CredentialCriteria* criteria=NULL
-            ) const=0;
+        using TrustEngine::validate;
 
         /**
          * Determines whether an X.509 credential is valid with respect to the