X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltooling%2Fsignature%2FSignatureValidator.h;h=9724c778e2c08f52ff011e21b4754e5008a0994c;hb=28e2077c02f1bb4196730a88aa81aa72de9798e1;hp=7f7fa7daffcda202ab51a5b8309c1ea47bb8ff2b;hpb=2f2e0fb8331affb168f0c5dd6b0792801bd0a8e2;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/xmltooling/signature/SignatureValidator.h b/xmltooling/signature/SignatureValidator.h
index 7f7fa7d..9724c77 100644
--- a/xmltooling/signature/SignatureValidator.h
+++ b/xmltooling/signature/SignatureValidator.h
@@ -1,94 +1,102 @@
-/*
- *  Copyright 2001-2006 Internet2
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @file SignatureValidator.h
- * 
- * Validator for signatures based on an externally-supplied key 
- */
-
-#if !defined(__xmltooling_sigval_h__) && !defined(XMLTOOLING_NO_XMLSEC)
-#define __xmltooling_sigval_h__
-
-#include <xmltooling/signature/KeyResolver.h>
-#include <xmltooling/signature/Signature.h>
-#include <xmltooling/validation/Validator.h>
-
-namespace xmlsignature {
-
-    /**
-     * Validator for signatures based on a Key or a KeyResolver
-     */
-    class XMLTOOL_API SignatureValidator : public xmltooling::Validator
-    {
-    public:
-        /**
-         * Constructor using a KeyResolver
-         * 
-         * @param resolver the key resolver to use, will be freed by Validator
-         */
-        SignatureValidator(KeyResolver* resolver) : m_key(NULL), m_resolver(resolver) {
-        }
-
-        /**
-         * Constructor using a Key
-         * 
-         * @param key the verification key to use, will be freed by Validator
-         */
-        SignatureValidator(XSECCryptoKey* key=NULL) : m_key(key), m_resolver(NULL) {
-        }
-        
-        virtual ~SignatureValidator() {
-            delete m_key;
-            delete m_resolver;
-        }
-
-        virtual void validate(const xmltooling::XMLObject* xmlObject) const;
-
-        virtual void validate(const Signature* signature) const;
-        
-        /**
-         * Replace the current Key, if any, with a new one.
-         * 
-         * @param key  the Key to attach 
-         */
-        void setKey(XSECCryptoKey* key) {
-            delete m_key;
-            delete m_resolver;
-            m_resolver=NULL;
-            m_key=key;
-        }
-
-        /**
-         * Replace the current KeyResolver, if any, with a new one.
-         * 
-         * @param resolver  the KeyResolver to attach 
-         */
-        void setKeyResolver(KeyResolver* resolver) {
-            delete m_key;
-            delete m_resolver;
-            m_key=NULL;
-            m_resolver=resolver;
-        }
-    
-    protected:
-        XSECCryptoKey* m_key;
-        KeyResolver* m_resolver;
-    };
-
-};
-
-#endif /* __xmltooling_sigval_h__ */
+/*
+ *  Copyright 2001-2006 Internet2
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @file SignatureValidator.h
+ * 
+ * Validator for signatures based on an externally-supplied key 
+ */
+
+#if !defined(__xmltooling_sigval_h__) && !defined(XMLTOOLING_NO_XMLSEC)
+#define __xmltooling_sigval_h__
+
+#include <xmltooling/signature/KeyResolver.h>
+#include <xmltooling/signature/Signature.h>
+#include <xmltooling/validation/Validator.h>
+
+namespace xmlsignature {
+
+    /**
+     * Validator for signatures based on a Key or a KeyResolver
+     */
+    class XMLTOOL_API SignatureValidator : public xmltooling::Validator
+    {
+    public:
+        /**
+         * Constructor using a KeyResolver
+         * 
+         * @param resolver the key resolver to use, will be freed by Validator
+         */
+        SignatureValidator(KeyResolver* resolver) : m_key(NULL), m_resolver(resolver) {
+        }
+
+        /**
+         * Constructor using a Key
+         * 
+         * @param key the verification key to use, will be freed by Validator
+         */
+        SignatureValidator(XSECCryptoKey* key=NULL) : m_key(key), m_resolver(NULL) {
+        }
+        
+        virtual ~SignatureValidator() {
+            delete m_key;
+            delete m_resolver;
+        }
+
+        virtual void validate(const xmltooling::XMLObject* xmlObject) const;
+
+        /**
+         * Type-safe validator.
+         * 
+         * @param signature object to validate
+         */
+        virtual void validate(const Signature* signature) const;
+        
+        /**
+         * Replace the current Key, if any, with a new one.
+         * 
+         * @param key  the Key to attach 
+         */
+        void setKey(XSECCryptoKey* key) {
+            delete m_key;
+            delete m_resolver;
+            m_resolver=NULL;
+            m_key=key;
+        }
+
+        /**
+         * Replace the current KeyResolver, if any, with a new one.
+         * 
+         * @param resolver  the KeyResolver to attach 
+         */
+        void setKeyResolver(KeyResolver* resolver) {
+            delete m_key;
+            delete m_resolver;
+            m_key=NULL;
+            m_resolver=resolver;
+        }
+    
+    protected:
+        /** Verification key. */
+        XSECCryptoKey* m_key;
+        
+        /** KeyResolver to use against signature. */
+        KeyResolver* m_resolver;
+    };
+
+};
+
+#endif /* __xmltooling_sigval_h__ */