Convert from NULL macro to nullptr.

[shibboleth/cpp-xmltooling.git] / xmltooling / security / X509TrustEngine.h

diff --git a/xmltooling/security/X509TrustEngine.h b/xmltooling/security/X509TrustEngine.h
index 0d45321..4c29c6d 100644 (file)
--- a/xmltooling/security/X509TrustEngine.h
+++ b/xmltooling/security/X509TrustEngine.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2007 Internet2
+ *  Copyright 2001-2010 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 /**
  * @file xmltooling/security/X509TrustEngine.h
  * 
- * Extended TrustEngine interface that adds validation of X.509 credentials.
+ * TrustEngine interface that adds validation of X.509 credentials.
  */
 
 #if !defined(__xmltooling_x509trust_h__) && !defined(XMLTOOLING_NO_XMLSEC)
@@ -25,12 +25,19 @@
 
 #include <xmltooling/security/TrustEngine.h>
 
+#include <vector>
+
+class XSECCryptoX509;
+
 namespace xmltooling {
 
+    class XMLTOOL_API CredentialCriteria;
+    class XMLTOOL_API CredentialResolver;
+
     /**
-     * Extended TrustEngine interface that adds validation of X.509 credentials.
+     * TrustEngine interface that adds validation of X.509 credentials.
      */
-    class XMLTOOL_API X509TrustEngine : public TrustEngine {
+    class XMLTOOL_API X509TrustEngine : public virtual TrustEngine {
     protected:
         /**
          * Constructor.
@@ -45,26 +52,10 @@ namespace xmltooling {
          * 
          * @param e DOM to supply configuration for provider
          */
-        X509TrustEngine(const xercesc::DOMElement* e=NULL) : TrustEngine(e) {}
+        X509TrustEngine(const xercesc::DOMElement* e=nullptr);
         
     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;
+        virtual ~X509TrustEngine();
 
         /**
          * Determines whether an X.509 credential is valid with respect to the
@@ -88,7 +79,7 @@ namespace xmltooling {
             XSECCryptoX509* certEE,
             const std::vector<XSECCryptoX509*>& certChain,
             const CredentialResolver& credResolver,
-            CredentialCriteria* criteria=NULL
+            CredentialCriteria* criteria=nullptr
             ) const=0;
     };