Update library version header, require Xerces 3.1 on older SUSE

[shibboleth/cpp-opensaml.git] / saml / signature / ContentReference.h

diff --git a/saml/signature/ContentReference.h b/saml/signature/ContentReference.h
index f85a906..3c1dc75 100644 (file)
--- a/saml/signature/ContentReference.h
+++ b/saml/signature/ContentReference.h
@@ -1,37 +1,53 @@
-/*
- *  Copyright 2001-2007 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
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ *
+ * UCAID licenses this file to you 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
+ * 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.
+ * 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 saml/signature/ContentReference.h
  * 
- * SAML-specific signature reference profile 
+ * SAML-specific signature reference profile.
  */
 
 #ifndef __saml_sigref_h__
 #define __saml_sigref_h__
 
 #include <saml/base.h>
-#include <xmltooling/signature/ContentReference.h>
 
+#include <set>
 #include <string>
+#include <xmltooling/unicode.h>
+#include <xmltooling/signature/ContentReference.h>
+
+namespace xmltooling {
+    class XMLTOOL_API Namespace;
+    class XMLTOOL_API XMLObject;
+};
 
 namespace opensaml {
 
     class SAML_API SignableObject;
 
+#if defined (_MSC_VER)
+    #pragma warning( push )
+    #pragma warning( disable : 4251 )
+#endif
+
     /**
      * SAML-specific signature reference profile.
      */
@@ -43,10 +59,9 @@ namespace opensaml {
          * 
          * @param signableObject    reference to object being signed
          */
-        ContentReference(const SignableObject& signableObject) : m_signableObject(signableObject) {
-        }
+        ContentReference(const SignableObject& signableObject);
     
-        virtual ~ContentReference() {}
+        virtual ~ContentReference();
 
         /**
          * Given a "blank" native signature, creates signature reference
@@ -57,24 +72,40 @@ namespace opensaml {
         virtual void createReferences(DSIGSignature* sig);
         
         /**
-         * Adds a namespace prefix for "inclusive" processing by the
+         * Adds a namespace prefix for "inclusive" processing by an
          * Exclusive C14N Transform applied to the object.
          * An empty string will be transformed into "#default".
          * 
          * @param prefix    the prefix to add 
          */
-        void addInclusivePrefix(const char* prefix) {
-            m_prefixes.push_back(prefix);
-        }
+        void addInclusivePrefix(const XMLCh* prefix);
+        
+        /**
+         * Sets the digest algorithm for the signature reference,
+         * using a constant.
+         * 
+         * @param digest    the digest algorithm
+         */
+        void setDigestAlgorithm(const XMLCh* digest);
 
-    protected:
-        /** Reference to object to sign. */
+        /**
+         * Sets the canonicalization method to include in the reference,
+         * using a constant.
+         * 
+         * @param c14n  the canonicalization method
+         */
+        void setCanonicalizationMethod(const XMLCh* c14n);
+        
+    private:
         const SignableObject& m_signableObject;
-
-        /** Inclusive prefixes. */
-        std::vector<std::string> m_prefixes;
+        std::set<xmltooling::xstring> m_prefixes;
+        const XMLCh* m_digest;
+        const XMLCh* m_c14n;
     };
 
+#if defined (_MSC_VER)
+    #pragma warning( pop )
+#endif
 };
 
 #endif /* __saml_sigref_h__ */