/*
- * Copyright 2001-2005 Internet2
+ * 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.
#define XMLTOOLING_LOGCAT "XMLTooling"
+// Macros for path and directory separators.
+#if defined __CYGWIN32__ && !defined __CYGWIN__
+ /* For backwards compatibility with Cygwin b19 and
+ earlier, we define __CYGWIN__ here, so that
+ we can rely on checking just for that macro. */
+# define __CYGWIN__ __CYGWIN32__
+#endif
+
+#if defined _WIN32 && !defined __CYGWIN__
+ /* Use Windows separators on all _WIN32 defining
+ environments, except Cygwin. */
+# define DIR_SEPARATOR_CHAR '\\'
+# define DIR_SEPARATOR_STR "\\"
+# define PATH_SEPARATOR_CHAR ';'
+# define PATH_SEPARATOR_STR ";"
+#endif
+#ifndef DIR_SEPARATOR_CHAR
+ /* Assume that not having this is an indicator that all
+ are missing. */
+# define DIR_SEPARATOR_CHAR '/'
+# define DIR_SEPARATOR_STR "/"
+# define PATH_SEPARATOR_CHAR ':'
+# define PATH_SEPARATOR_STR ":"
+#endif /* !DIR_SEPARATOR_CHAR */
+
namespace xmltooling {
/// @cond OFF
- class XMLToolingInternalConfig : public xmltooling::XMLToolingConfig
+ class XMLToolingInternalConfig : public XMLToolingConfig
{
public:
- XMLToolingInternalConfig() : m_parserPool(NULL), m_validatingPool(NULL), m_lock(NULL) {
+ XMLToolingInternalConfig() :
#ifndef XMLTOOLING_NO_XMLSEC
- m_xsecProvider=NULL;
+ m_xsecProvider(nullptr),
#endif
+ m_lock(nullptr), m_parserPool(nullptr), m_validatingPool(nullptr)
+ {
}
static XMLToolingInternalConfig& getInternalConfig();
void term();
// global mutex available to library applications
- Lockable& lock();
+ Lockable* lock();
void unlock();
// configuration
- bool load_library(const char* path, void* context=NULL);
- bool log_config(const char* config=NULL);
+ bool load_library(const char* path, void* context=nullptr);
+ bool log_config(const char* config=nullptr);
// parser access
ParserPool& getParser() const {
}
#ifndef XMLTOOLING_NO_XMLSEC
+ XSECCryptoX509CRL* X509CRL() const;
+ 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:
+ typedef std::map<XMLSecurityAlgorithmType, std::map< xstring,std::pair<std::string,unsigned int> > > algmap_t;
+ algmap_t m_algorithmMap;
#endif
private:
ParserPool* m_parserPool;
ParserPool* m_validatingPool;
};
+
+#ifndef XMLTOOLING_NO_XMLSEC
+ void log_openssl();
+#endif
+
/// @endcond
};