gcc const fix, converted linefeeds

[shibboleth/cpp-xmltooling.git] / xmltooling / signature / SignatureValidator.h

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