X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltooling%2Futil%2FXMLConstants.h;h=961f0ded59ecddd72f176d419ca92fd8ee320032;hb=81b488b2790e7bdeb2f43560b1d4a7d22c3dfdf5;hp=3243526bf92e710d82fa513b8c529e3f2d186134;hpb=115f18055855615bf1349842293c1f28ad7f42e5;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/xmltooling/util/XMLConstants.h b/xmltooling/util/XMLConstants.h
index 3243526..961f0de 100644
--- a/xmltooling/util/XMLConstants.h
+++ b/xmltooling/util/XMLConstants.h
@@ -1,29 +1,34 @@
-/*
- *  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
+/**
+ * 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.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * 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
  *
- * 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.
+ * 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 XMLConstants.h
+ * @file xmltooling/util/XMLConstants.h
  * 
- * Fundamental XML namespace constants 
+ * Fundamental XML namespace constants.
  */
 
-#if !defined(__xmltooling_xmlconstants_h__)
+#ifndef __xmltooling_xmlconstants_h__
 #define __xmltooling_xmlconstants_h__
 
-#include <xmltooling/unicode.h>
+#include <xmltooling/base.h>
+#include <xercesc/util/XercesDefs.hpp>
 
 /**
  * XML related constants.
@@ -59,6 +64,12 @@ namespace xmlconstants {
     
     /**  XML Signature QName prefix ("ds") */
     extern XMLTOOL_API const XMLCh XMLSIG_PREFIX[];
+
+    /**  XML Signature namespace ("http://www.w3.org/2009/xmldsig11#") */
+    extern XMLTOOL_API const XMLCh XMLSIG11_NS[];
+
+    /**  XML Signature QName prefix ("ds11") */
+    extern XMLTOOL_API const XMLCh XMLSIG11_PREFIX[];
     
     /**  XML Encryption namespace ("http://www.w3.org/2001/04/xmlenc#") */
     extern XMLTOOL_API const XMLCh XMLENC_NS[];
@@ -95,36 +106,6 @@ namespace xmlconstants {
         XML_BOOL_ONE,
         XML_BOOL_ZERO
     };
-
-    /** PKCS#1 DigestInfo Encoding OID for RSAwithSHA1 */
-    extern XMLTOOL_API const unsigned char OID_RSASHA1[];
-    
-    /** Size of PKCS#1 DigestInfo Encoding OID for RSAwithSHA1 */
-    extern XMLTOOL_API const int OID_RSASHA1_LEN;
-
-    /** PKCS#1 DigestInfo Encoding OID for RSAwithSHA224 */
-    extern XMLTOOL_API const unsigned char OID_RSASHA224[];
-    
-    /** Size of PKCS#1 DigestInfo Encoding OID for RSAwithSHA224 */
-    extern XMLTOOL_API const int OID_RSASHA224_LEN;
-
-    /** PKCS#1 DigestInfo Encoding OID for RSAwithSHA256 */
-    extern XMLTOOL_API const unsigned char OID_RSASHA256[];
-    
-    /** Size of PKCS#1 DigestInfo Encoding OID for RSAwithSHA256 */
-    extern XMLTOOL_API const int OID_RSASHA256_LEN;
-
-    /** PKCS#1 DigestInfo Encoding OID for RSAwithSHA384 */
-    extern XMLTOOL_API const unsigned char OID_RSASHA384[];
-    
-    /** Size of PKCS#1 DigestInfo Encoding OID for RSAwithSHA384 */
-    extern XMLTOOL_API const int OID_RSASHA384_LEN;
-
-    /** PKCS#1 DigestInfo Encoding OID for RSAwithSHA512 */
-    extern XMLTOOL_API const unsigned char OID_RSASHA512[];
-    
-    /** Size of PKCS#1 DigestInfo Encoding OID for RSAwithSHA512 */
-    extern XMLTOOL_API const int OID_RSASHA512_LEN;
 };
 
 #endif /* __xmltooling_xmlconstants_h__ */