Set fourth file version digit to signify rebuild.

[shibboleth/cpp-xmltooling.git] / xmltooling / internal.h

diff --git a/xmltooling/internal.h b/xmltooling/internal.h
index f4f8bea..c39bb8d 100644 (file)
--- a/xmltooling/internal.h
+++ b/xmltooling/internal.h
@@ -1,17 +1,21 @@
-/*
- *  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.
- * 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.
  */
 
 /*
@@ -24,6 +28,7 @@
 #ifdef WIN32
 # define _CRT_SECURE_NO_DEPRECATE 1
 # define _CRT_NONSTDC_NO_DEPRECATE 1
+# define _SCL_SECURE_NO_WARNINGS 1
 #endif
 
 // Export public APIs.
@@ -40,13 +45,18 @@
 #include "XMLToolingConfig.h"
 #include "util/ParserPool.h"
 
+#include <map>
+#include <string>
 #include <vector>
+
 #ifndef XMLTOOLING_NO_XMLSEC
     #include <xsec/framework/XSECProvider.hpp>
 #endif
 
 #define XMLTOOLING_LOGCAT "XMLTooling"
 
+#define XMLTOOLING_ENTITY_EXPANSION_LIMIT 100
+
 // Macros for path and directory separators.
 #if defined __CYGWIN32__ && !defined __CYGWIN__
    /* For backwards compatibility with Cygwin b19 and
@@ -75,14 +85,11 @@
 namespace xmltooling {
     
     /// @cond OFF
-    class XMLToolingInternalConfig : public XMLToolingConfig
+    class XMLTOOL_DLLLOCAL XMLToolingInternalConfig : public XMLToolingConfig
     {
     public:
-        XMLToolingInternalConfig() : m_lock(nullptr), m_parserPool(nullptr), m_validatingPool(nullptr) {
-#ifndef XMLTOOLING_NO_XMLSEC
-            m_xsecProvider=nullptr;
-#endif
-        }
+        XMLToolingInternalConfig();
+        ~XMLToolingInternalConfig();
 
         static XMLToolingInternalConfig& getInternalConfig();
 
@@ -94,6 +101,9 @@ namespace xmltooling {
         Lockable* lock();
         void unlock();
 
+        // named mutexes to limit lock scope
+        Mutex& getNamedMutex(const char* name);
+
         // configuration
         bool load_library(const char* path, void* context=nullptr);
         bool log_config(const char* config=nullptr);
@@ -109,44 +119,24 @@ namespace xmltooling {
 
 #ifndef XMLTOOLING_NO_XMLSEC
         XSECCryptoX509CRL* X509CRL() const;
-
-        std::pair<const char*,unsigned int> mapXMLAlgorithmToKeyAlgorithm(const XMLCh* xmlAlgorithm) const {
-# ifdef HAVE_GOOD_STL
-            algmap_t::const_iterator i = m_algorithmMap.find(xmlAlgorithm);
-# else
-            auto_ptr_char alg(xmlAlgorithm);
-            algmap_t::const_iterator i = m_algorithmMap.find(alg.get());
-# endif
-            if (i==m_algorithmMap.end())
-                return std::pair<const char*,unsigned int>(nullptr,0);
-            return std::make_pair(i->second.first.c_str(), i->second.second);
-        }
-
-        void registerXMLAlgorithm(const XMLCh* xmlAlgorithm, const char* keyAlgorithm, unsigned int size=0) {
-# ifdef HAVE_GOOD_STL
-            m_algorithmMap[xmlAlgorithm] = std::pair<std::string,unsigned int>(keyAlgorithm,size);
-# else
-            auto_ptr_char alg(xmlAlgorithm);
-            m_algorithmMap[alg.get()] = std::pair<std::string,unsigned int>(keyAlgorithm,size);
-# endif
-        }
-
-        bool isXMLAlgorithmSupported(const XMLCh* xmlAlgorithm);
+        std::pair<const char*,unsigned int> mapXMLAlgorithmToKeyAlgorithm(const XMLCh* xmlAlgorithm) const;
+        void registerXMLAlgorithm(
+            const XMLCh* xmlAlgorithm, const char* keyAlgorithm, unsigned int size=0, XMLSecurityAlgorithmType type=ALGTYPE_UNK
+            );
+        bool isXMLAlgorithmSupported(const XMLCh* xmlAlgorithm, XMLSecurityAlgorithmType type=ALGTYPE_UNK);
         void registerXMLAlgorithms();
 
         XSECProvider* m_xsecProvider;
     private:
-# ifdef HAVE_GOOD_STL
-        typedef std::map< xstring,std::pair<std::string,unsigned int> > algmap_t;
-# else
-        typedef std::map< std::string,std::pair<std::string,unsigned int> > algmap_t;
-# endif
+        typedef std::map<XMLSecurityAlgorithmType, std::map< xstring,std::pair<std::string,unsigned int> > > algmap_t;
         algmap_t m_algorithmMap;
 #endif
 
     private:
+        int m_initCount;
+        std::auto_ptr<Mutex> m_lock;
+        std::map<std::string,Mutex*> m_namedLocks;
         std::vector<void*> m_libhandles;
-        void* m_lock;
         ParserPool* m_parserPool;
         ParserPool* m_validatingPool;
     };