Remove KeyInfo plugin from PKIX API.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-xmltooling/trunk@273 de75baf8-a10c-0410-a50a-987c0e22f00f

diff --git a/xmltooling/security/AbstractPKIXTrustEngine.h b/xmltooling/security/AbstractPKIXTrustEngine.h
index 02f692c..1fb9346 100644 (file)
--- a/xmltooling/security/AbstractPKIXTrustEngine.h
+++ b/xmltooling/security/AbstractPKIXTrustEngine.h
@@ -66,13 +66,13 @@ namespace xmltooling {
     public:
         virtual ~AbstractPKIXTrustEngine() {}
 
-        virtual bool validate(
+        bool validate(
             xmlsignature::Signature& sig,
             const CredentialResolver& credResolver,
             CredentialCriteria* criteria=NULL
             ) const;
 
-        virtual bool validate(
+        bool validate(
             const XMLCh* sigAlgorithm,
             const char* sig,
             xmlsignature::KeyInfo* keyInfo,
@@ -82,14 +82,14 @@ namespace xmltooling {
             CredentialCriteria* criteria=NULL
             ) const;
 
-        virtual bool validate(
+        bool validate(
             XSECCryptoX509* certEE,
             const std::vector<XSECCryptoX509*>& certChain,
             const CredentialResolver& credResolver,
             CredentialCriteria* criteria=NULL
             ) const;
 
-        virtual bool validate(
+        bool validate(
             X509* certEE,
             STACK_OF(X509)* certChain,
             const CredentialResolver& credResolver,
@@ -154,13 +154,10 @@ namespace xmltooling {
          * 
          * @param pkixSource        the peer for which validation rules are required
          * @param criteria          criteria for selecting validation rules
-         * @param keyInfoResolver   custom KeyInfoResolver to use for KeyInfo extraction
          * @return interface for obtaining validation data
          */
         virtual PKIXValidationInfoIterator* getPKIXValidationInfoIterator(
-            const CredentialResolver& pkixSource,
-            CredentialCriteria* criteria=NULL,
-            const KeyInfoResolver* keyInfoResolver=NULL
+            const CredentialResolver& pkixSource, CredentialCriteria* criteria=NULL
             ) const=0;
     };
 };

diff --git a/xmltooling/security/impl/AbstractPKIXTrustEngine.cpp b/xmltooling/security/impl/AbstractPKIXTrustEngine.cpp
index a891f7d..de9a0bb 100644 (file)
--- a/xmltooling/security/impl/AbstractPKIXTrustEngine.cpp
+++ b/xmltooling/security/impl/AbstractPKIXTrustEngine.cpp
@@ -271,7 +271,7 @@ bool AbstractPKIXTrustEngine::validate(
     
     log.debug("performing certificate path validation...");
 
-    auto_ptr<PKIXValidationInfoIterator> pkix(getPKIXValidationInfoIterator(credResolver, criteria, m_keyInfoResolver));
+    auto_ptr<PKIXValidationInfoIterator> pkix(getPKIXValidationInfoIterator(credResolver, criteria));
     while (pkix->next()) {
         if (::validate(certEE,certChain,pkix.get())) {
             return true;