}
AbstractXMLObject::AbstractXMLObject(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType)
- : m_log(logging::Category::getInstance(XMLTOOLING_LOGCAT".XMLObject")),
+ : m_log(logging::Category::getInstance(XMLTOOLING_LOGCAT ".XMLObject")),
m_schemaLocation(nullptr), m_noNamespaceSchemaLocation(nullptr), m_nil(xmlconstants::XML_BOOL_NULL),
m_parent(nullptr), m_elementQname(nsURI, localName, prefix)
{
#ifdef _DEBUG
xmltooling::NDC ndc("getBuilder");
#endif
- Category& log=Category::getInstance(XMLTOOLING_LOGCAT".XMLObject.Builder");
+ Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".XMLObject.Builder");
auto_ptr<QName> schemaType(XMLHelper::getXSIType(domElement));
const XMLObjectBuilder* xmlObjectBuilder = schemaType.get() ? getBuilder(*(schemaType.get())) : nullptr;
class TXFMOutputLog : public TXFMBase {
TXFMOutputLog();
public:
- TXFMOutputLog(DOMDocument* doc) : TXFMBase(doc), m_log(Category::getInstance(XMLTOOLING_LOGCAT".Signature.Debugger")) {
+ TXFMOutputLog(DOMDocument* doc) : TXFMBase(doc), m_log(Category::getInstance(XMLTOOLING_LOGCAT ".Signature.Debugger")) {
input = nullptr;
}
~TXFMOutputLog() {
};
TXFMBase* TXFMOutputLogFactory(DOMDocument* doc) {
- if (Category::getInstance(XMLTOOLING_LOGCAT".Signature.Debugger").isDebugEnabled())
+ if (Category::getInstance(XMLTOOLING_LOGCAT ".Signature.Debugger").isDebugEnabled())
return new TXFMOutputLog(doc);
return nullptr;
}
}
#ifndef XMLTOOLING_NO_XMLSEC
- Category::getInstance(XMLTOOLING_LOGCAT".Signature.Debugger").setAdditivity(false);
+ Category::getInstance(XMLTOOLING_LOGCAT ".Signature.Debugger").setAdditivity(false);
#endif
}
catch (const ConfigureFailure& e) {
string msg = string("error in file permissions or logging configuration: ") + e.what();
- Category::getInstance(XMLTOOLING_LOGCAT".Logging").crit(msg);
+ Category::getInstance(XMLTOOLING_LOGCAT ".Logging").crit(msg);
#ifdef WIN32
LogEvent(nullptr, EVENTLOG_ERROR_TYPE, 2100, nullptr, msg.c_str());
#endif
#ifdef _DEBUG
xmltooling::NDC ndc("init");
#endif
- Category& log=Category::getInstance(XMLTOOLING_LOGCAT".Config");
+ Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".Config");
Lock initLock(m_lock);
Lock initLock(m_lock);
if (m_initCount == 0) {
- Category::getInstance(XMLTOOLING_LOGCAT".Config").crit("term without corresponding init");
+ Category::getInstance(XMLTOOLING_LOGCAT ".Config").crit("term without corresponding init");
return;
}
else if (--m_initCount > 0) {
#ifndef XMLTOOLING_NO_XMLSEC
curl_global_cleanup();
#endif
- Category::getInstance(XMLTOOLING_LOGCAT".Config").info("%s library shutdown complete", PACKAGE_STRING);
+ Category::getInstance(XMLTOOLING_LOGCAT ".Config").info("%s library shutdown complete", PACKAGE_STRING);
}
Lockable* XMLToolingInternalConfig::lock()
#ifdef _DEBUG
xmltooling::NDC ndc("LoadLibrary");
#endif
- Category& log=Category::getInstance(XMLTOOLING_LOGCAT".Config");
+ Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".Config");
log.info("loading extension: %s", path);
Locker locker(this);
return decryptData(encryptedData, key);
}
catch(DecryptionException& ex) {
- logging::Category::getInstance(XMLTOOLING_LOGCAT".Decrypter").warn(ex.what());
+ logging::Category::getInstance(XMLTOOLING_LOGCAT ".Decrypter").warn(ex.what());
}
}
return decryptData(out, encryptedData, key);
}
catch(DecryptionException& ex) {
- logging::Category::getInstance(XMLTOOLING_LOGCAT".Decrypter").warn(ex.what());
+ logging::Category::getInstance(XMLTOOLING_LOGCAT ".Decrypter").warn(ex.what());
}
}
}
}
catch(DecryptionException& ex) {
- logging::Category::getInstance(XMLTOOLING_LOGCAT".Decrypter").warn(ex.what());
+ logging::Category::getInstance(XMLTOOLING_LOGCAT ".Decrypter").warn(ex.what());
}
}
// Some algorithms are vulnerable to chosen ciphertext attacks, so we generate a random key
// to prevent discovery of the validity of the original candidate.
- logging::Category::getInstance(XMLTOOLING_LOGCAT".Decrypter").warn(
+ logging::Category::getInstance(XMLTOOLING_LOGCAT ".Decrypter").warn(
"unable to decrypt key, generating random key for defensive purposes"
);
pair<const char*,unsigned int> mapped = XMLToolingConfig::getConfig().mapXMLAlgorithmToKeyAlgorithm(algorithm);
MemoryStorageService::MemoryStorageService(const DOMElement* e)
: m_lock(RWLock::create()), shutdown_wait(CondWait::create()), shutdown(false),
m_cleanupInterval(XMLHelper::getAttrInt(e, 900, cleanupInterval)),
- m_log(Category::getInstance(XMLTOOLING_LOGCAT".StorageService"))
+ m_log(Category::getInstance(XMLTOOLING_LOGCAT ".StorageService"))
{
cleanup_thread.reset(Thread::create(&cleanup_fn, (void*)this));
}
#ifdef _DEBUG
xmltooling::NDC ndc("releaseDOM");
#endif
- Category& log=Category::getInstance(XMLTOOLING_LOGCAT".XMLObject");
+ Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".XMLObject");
log.debug("releasing DOM for unknown content, preserving current DOM in XML form");
// We're losing our DOM, so assuming we have one, we preserve it.
xmltooling::NDC ndc("marshall");
#endif
- Category& log=Category::getInstance(XMLTOOLING_LOGCAT".XMLObject");
+ Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".XMLObject");
log.debug("marshalling unknown content");
DOMElement* cachedDOM=getDOM();
xmltooling::NDC ndc("marshall");
#endif
- Category& log=Category::getInstance(XMLTOOLING_LOGCAT".XMLObject");
+ Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".XMLObject");
log.debug("marshalling unknown content");
DOMElement* cachedDOM=getDOM();
m_anyPolicyInhibit(XMLHelper::getAttrBool(e, false, anyPolicyInhibit))
{
if (m_fullCRLChain) {
- Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine.PKIX").warn(
+ Category::getInstance(XMLTOOLING_LOGCAT ".TrustEngine.PKIX").warn(
"fullCRLChain option is deprecated, setting checkRevocation to \"fullChain\""
);
m_checkRevocation = "fullChain";
try {
string t = XMLHelper::getAttrString(c, nullptr, type);
if (!t.empty()) {
- Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine.PKIX").info(
+ Category::getInstance(XMLTOOLING_LOGCAT ".TrustEngine.PKIX").info(
"building PathValidator of type %s", t.c_str()
);
PathValidator* pv = XMLToolingConfig::getConfig().PathValidatorManager.newPlugin(t.c_str(), c);
}
}
catch (exception& ex) {
- Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine.PKIX").error(
+ Category::getInstance(XMLTOOLING_LOGCAT ".TrustEngine.PKIX").error(
"error building PathValidator: %s", ex.what()
);
}
X509* certEE, const CredentialResolver& credResolver, const CredentialCriteria& criteria
) const
{
- Category& log=Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine.PKIX");
+ Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".TrustEngine.PKIX");
// We resolve to a set of trusted credentials.
vector<const Credential*> creds;
#ifdef _DEBUG
NDC ndc("validateWithCRLs");
#endif
- Category& log=Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine.PKIX");
+ Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".TrustEngine.PKIX");
if (!certEE) {
log.error("X.509 credential was NULL, unable to perform validation");
NDC ndc("validate");
#endif
if (!certEE) {
- Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine.PKIX").error("X.509 credential was NULL, unable to perform validation");
+ Category::getInstance(XMLTOOLING_LOGCAT ".TrustEngine.PKIX").error("X.509 credential was NULL, unable to perform validation");
return false;
}
else if (certEE->getProviderName()!=DSIGConstants::s_unicodeStrPROVOpenSSL) {
- Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine.PKIX").error("only the OpenSSL XSEC provider is supported");
+ Category::getInstance(XMLTOOLING_LOGCAT ".TrustEngine.PKIX").error("only the OpenSSL XSEC provider is supported");
return false;
}
#ifdef _DEBUG
NDC ndc("validate");
#endif
- Category& log=Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine.PKIX");
+ Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".TrustEngine.PKIX");
const KeyInfoResolver* inlineResolver = m_keyInfoResolver;
if (!inlineResolver)
#ifdef _DEBUG
NDC ndc("validate");
#endif
- Category& log=Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine.PKIX");
+ Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".TrustEngine.PKIX");
if (!keyInfo) {
log.error("unable to perform PKIX validation, KeyInfo not present");
ChainingCredentialResolver::ChainingCredentialResolver(const DOMElement* e)
{
XMLToolingConfig& conf = XMLToolingConfig::getConfig();
- Category& log=Category::getInstance(XMLTOOLING_LOGCAT".CredentialResolver."CHAINING_CREDENTIAL_RESOLVER);
+ Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".CredentialResolver." CHAINING_CREDENTIAL_RESOLVER);
// Load up the chain of resolvers.
e = e ? XMLHelper::getFirstChildElement(e, _CredentialResolver) : nullptr;
ChainingTrustEngine::ChainingTrustEngine(const DOMElement* e) : TrustEngine(e)
{
- Category& log=Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine."CHAINING_TRUSTENGINE);
+ Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".TrustEngine." CHAINING_TRUSTENGINE);
e = e ? XMLHelper::getFirstChildElement(e, _TrustEngine) : nullptr;
while (e) {
try {
bool CredentialCriteria::matches(const Credential& credential) const
{
- Category& log = Category::getInstance(XMLTOOLING_LOGCAT".CredentialCriteria");
+ Category& log = Category::getInstance(XMLTOOLING_LOGCAT ".CredentialCriteria");
// Usage check, if specified and we have one, compare masks.
if (getUsage() != Credential::UNSPECIFIED_CREDENTIAL) {
#ifdef _DEBUG
NDC ndc("validate");
#endif
- Category& log=Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine."EXPLICIT_KEY_TRUSTENGINE);
+ Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".TrustEngine." EXPLICIT_KEY_TRUSTENGINE);
vector<const Credential*> credentials;
if (criteria) {
#ifdef _DEBUG
NDC ndc("validate");
#endif
- Category& log=Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine."EXPLICIT_KEY_TRUSTENGINE);
+ Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".TrustEngine."EXPLICIT_KEY_TRUSTENGINE);
vector<const Credential*> credentials;
if (criteria) {
NDC ndc("validate");
#endif
if (!certEE) {
- Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine."EXPLICIT_KEY_TRUSTENGINE).error("unable to validate, end-entity certificate was null");
+ Category::getInstance(XMLTOOLING_LOGCAT ".TrustEngine."EXPLICIT_KEY_TRUSTENGINE).error("unable to validate, end-entity certificate was null");
return false;
}
else if (certEE->getProviderName()!=DSIGConstants::s_unicodeStrPROVOpenSSL) {
- Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine."EXPLICIT_KEY_TRUSTENGINE).error("only the OpenSSL XSEC provider is supported");
+ Category::getInstance(XMLTOOLING_LOGCAT ".TrustEngine."EXPLICIT_KEY_TRUSTENGINE).error("only the OpenSSL XSEC provider is supported");
return false;
}
#ifdef _DEBUG
NDC ndc("validate");
#endif
- Category& log=Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine."EXPLICIT_KEY_TRUSTENGINE);
+ Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".TrustEngine."EXPLICIT_KEY_TRUSTENGINE);
if (!certEE) {
log.error("unable to validate, end-entity certificate was null");
#ifdef _DEBUG
NDC ndc("FilesystemCredentialResolver");
#endif
- Category& log=Category::getInstance(XMLTOOLING_LOGCAT".CredentialResolver."FILESYSTEM_CREDENTIAL_RESOLVER);
+ Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".CredentialResolver." FILESYSTEM_CREDENTIAL_RESOLVER);
if (e && (e->hasAttributeNS(nullptr,_certificate) || e->hasAttributeNS(nullptr,_key))) {
// Dummy up a simple file resolver config using these attributes.
#ifdef _DEBUG
NDC ndc("lock");
#endif
- Category& log=Category::getInstance(XMLTOOLING_LOGCAT".CredentialResolver."FILESYSTEM_CREDENTIAL_RESOLVER);
+ Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".CredentialResolver."FILESYSTEM_CREDENTIAL_RESOLVER);
m_lock->rdlock();
bool InlineCredential::resolveKey(const KeyInfo* keyInfo, bool followRefs)
{
- Category& log = Category::getInstance(XMLTOOLING_LOGCAT".KeyInfoResolver."INLINE_KEYINFO_RESOLVER);
+ Category& log = Category::getInstance(XMLTOOLING_LOGCAT ".KeyInfoResolver." INLINE_KEYINFO_RESOLVER);
// Check for ds:KeyValue
const vector<KeyValue*>& keyValues = keyInfo->getKeyValues();
bool InlineCredential::resolveCerts(const KeyInfo* keyInfo, bool followRefs)
{
- Category& log = Category::getInstance(XMLTOOLING_LOGCAT".KeyInfoResolver."INLINE_KEYINFO_RESOLVER);
+ Category& log = Category::getInstance(XMLTOOLING_LOGCAT ".KeyInfoResolver."INLINE_KEYINFO_RESOLVER);
// Check for ds:X509Data
const vector<X509Data*>& x509Datas=keyInfo->getX509Datas();
bool InlineCredential::resolveCRLs(const KeyInfo* keyInfo, bool followRefs)
{
- Category& log = Category::getInstance(XMLTOOLING_LOGCAT".KeyInfoResolver."INLINE_KEYINFO_RESOLVER);
+ Category& log = Category::getInstance(XMLTOOLING_LOGCAT ".KeyInfoResolver."INLINE_KEYINFO_RESOLVER);
// Check for ds:X509Data
const vector<X509Data*>& x509Datas=keyInfo->getX509Datas();
}
catch(XSECException& e) {
auto_ptr_char temp(e.getMsg());
- Category::getInstance(XMLTOOLING_LOGCAT".KeyResolver."INLINE_KEYINFO_RESOLVER).error("caught XML-Security exception loading certificate: %s", temp.get());
+ Category::getInstance(XMLTOOLING_LOGCAT ".KeyResolver."INLINE_KEYINFO_RESOLVER).error("caught XML-Security exception loading certificate: %s", temp.get());
}
catch(XSECCryptoException& e) {
- Category::getInstance(XMLTOOLING_LOGCAT".KeyResolver."INLINE_KEYINFO_RESOLVER).error("caught XML-Security exception loading certificate: %s", e.getMsg());
+ Category::getInstance(XMLTOOLING_LOGCAT ".KeyResolver."INLINE_KEYINFO_RESOLVER).error("caught XML-Security exception loading certificate: %s", e.getMsg());
}
}
}
catch(XSECException& e) {
auto_ptr_char temp(e.getMsg());
- Category::getInstance(XMLTOOLING_LOGCAT".KeyResolver."INLINE_KEYINFO_RESOLVER).error("caught XML-Security exception loading CRL: %s", temp.get());
+ Category::getInstance(XMLTOOLING_LOGCAT ".KeyResolver."INLINE_KEYINFO_RESOLVER).error("caught XML-Security exception loading CRL: %s", temp.get());
}
catch(XSECCryptoException& e) {
- Category::getInstance(XMLTOOLING_LOGCAT".KeyResolver."INLINE_KEYINFO_RESOLVER).error("caught XML-Security exception loading CRL: %s", e.getMsg());
+ Category::getInstance(XMLTOOLING_LOGCAT ".KeyResolver."INLINE_KEYINFO_RESOLVER).error("caught XML-Security exception loading CRL: %s", e.getMsg());
}
}
}
}
catch(XSECException& e) {
auto_ptr_char temp(e.getMsg());
- Category::getInstance(XMLTOOLING_LOGCAT".KeyResolver."INLINE_KEYINFO_RESOLVER).error("caught XML-Security exception loading CRL: %s", temp.get());
+ Category::getInstance(XMLTOOLING_LOGCAT ".KeyResolver."INLINE_KEYINFO_RESOLVER).error("caught XML-Security exception loading CRL: %s", temp.get());
}
catch(XSECCryptoException& e) {
- Category::getInstance(XMLTOOLING_LOGCAT".KeyResolver."INLINE_KEYINFO_RESOLVER).error("caught XML-Security exception loading CRL: %s", e.getMsg());
+ Category::getInstance(XMLTOOLING_LOGCAT ".KeyResolver."INLINE_KEYINFO_RESOLVER).error("caught XML-Security exception loading CRL: %s", e.getMsg());
}
}
}
{
public:
PKIXPathValidator(const xercesc::DOMElement* e)
- : m_log(Category::getInstance(XMLTOOLING_LOGCAT".PathValidator.PKIX")),
- m_lock(XMLToolingConfig::getConfig().getNamedMutex(XMLTOOLING_LOGCAT".PathValidator.PKIX")),
+ : m_log(Category::getInstance(XMLTOOLING_LOGCAT ".PathValidator.PKIX")),
+ m_lock(XMLToolingConfig::getConfig().getNamedMutex(XMLTOOLING_LOGCAT ".PathValidator.PKIX")),
m_minRefreshDelay(XMLHelper::getAttrInt(e, 60, minRefreshDelay)),
m_minSecondsRemaining(XMLHelper::getAttrInt(e, 86400, minSecondsRemaining)),
m_minPercentRemaining(XMLHelper::getAttrInt(e, 10, minPercentRemaining)) {
#ifdef _DEBUG
NDC ndc("loadKeyFromFile");
#endif
- Category& log = Category::getInstance(XMLTOOLING_LOGCAT".SecurityHelper");
+ Category& log = Category::getInstance(XMLTOOLING_LOGCAT ".SecurityHelper");
log.info("loading private key from file (%s)", pathname);
// Native objects.
#ifdef _DEBUG
NDC ndc("loadCertificatesFromFile");
#endif
- Category& log = Category::getInstance(XMLTOOLING_LOGCAT".SecurityHelper");
+ Category& log = Category::getInstance(XMLTOOLING_LOGCAT ".SecurityHelper");
log.info("loading certificate(s) from file (%s)", pathname);
vector<XSECCryptoX509*>::size_type count = certs.size();
#ifdef _DEBUG
NDC ndc("loadCRLsFromFile");
#endif
- Category& log = Category::getInstance(XMLTOOLING_LOGCAT".SecurityHelper");
+ Category& log = Category::getInstance(XMLTOOLING_LOGCAT ".SecurityHelper");
log.info("loading CRL(s) from file (%s)", pathname);
vector<XSECCryptoX509CRL*>::size_type count = crls.size();
{
if (key1.getProviderName()!=DSIGConstants::s_unicodeStrPROVOpenSSL ||
key2.getProviderName()!=DSIGConstants::s_unicodeStrPROVOpenSSL) {
- Category::getInstance(XMLTOOLING_LOGCAT".SecurityHelper").warn("comparison of non-OpenSSL keys not supported");
+ Category::getInstance(XMLTOOLING_LOGCAT ".SecurityHelper").warn("comparison of non-OpenSSL keys not supported");
return false;
}
}
#endif
- Category::getInstance(XMLTOOLING_LOGCAT".SecurityHelper").warn("unsupported key type for comparison");
+ Category::getInstance(XMLTOOLING_LOGCAT ".SecurityHelper").warn("unsupported key type for comparison");
return false;
}
const EVP_MD* md = EVP_get_digestbyname(hashAlg);
if (!md) {
- Category::getInstance(XMLTOOLING_LOGCAT".SecurityHelper").error("hash algorithm (%s) not available", hashAlg);
+ Category::getInstance(XMLTOOLING_LOGCAT ".SecurityHelper").error("hash algorithm (%s) not available", hashAlg);
return ret;
}
int len = BIO_gets(chain, digest, EVP_MD_size(md));
BIO_free_all(chain);
if (len != EVP_MD_size(md)) {
- Category::getInstance(XMLTOOLING_LOGCAT".SecurityHelper").error(
+ Category::getInstance(XMLTOOLING_LOGCAT ".SecurityHelper").error(
"hash result length (%d) did not match expected value (%d)", len, EVP_MD_size(md)
);
return ret;
string ret;
if (key.getProviderName()!=DSIGConstants::s_unicodeStrPROVOpenSSL) {
- Category::getInstance(XMLTOOLING_LOGCAT".SecurityHelper").warn("encoding of non-OpenSSL keys not supported");
+ Category::getInstance(XMLTOOLING_LOGCAT ".SecurityHelper").warn("encoding of non-OpenSSL keys not supported");
return ret;
}
if (key.getKeyType() == XSECCryptoKey::KEY_RSA_PUBLIC || key.getKeyType() == XSECCryptoKey::KEY_RSA_PAIR) {
rsa = static_cast<const OpenSSLCryptoKeyRSA&>(key).getOpenSSLRSA();
if (!rsa) {
- Category::getInstance(XMLTOOLING_LOGCAT".SecurityHelper").warn("key was not populated");
+ Category::getInstance(XMLTOOLING_LOGCAT ".SecurityHelper").warn("key was not populated");
return ret;
}
}
else if (key.getKeyType() == XSECCryptoKey::KEY_DSA_PUBLIC || key.getKeyType() == XSECCryptoKey::KEY_DSA_PAIR) {
dsa = static_cast<const OpenSSLCryptoKeyDSA&>(key).getOpenSSLDSA();
if (!dsa) {
- Category::getInstance(XMLTOOLING_LOGCAT".SecurityHelper").warn("key was not populated");
+ Category::getInstance(XMLTOOLING_LOGCAT ".SecurityHelper").warn("key was not populated");
return ret;
}
}
else if (key.getKeyType() == XSECCryptoKey::KEY_EC_PUBLIC || key.getKeyType() == XSECCryptoKey::KEY_EC_PAIR) {
ec = static_cast<const OpenSSLCryptoKeyEC&>(key).getOpenSSLEC();
if (!ec) {
- Category::getInstance(XMLTOOLING_LOGCAT".SecurityHelper").warn("key was not populated");
+ Category::getInstance(XMLTOOLING_LOGCAT ".SecurityHelper").warn("key was not populated");
return ret;
}
}
#endif
else {
- Category::getInstance(XMLTOOLING_LOGCAT".SecurityHelper").warn("public key type not supported");
+ Category::getInstance(XMLTOOLING_LOGCAT ".SecurityHelper").warn("public key type not supported");
return ret;
}
if (hash) {
md = EVP_get_digestbyname(hash);
if (!md) {
- Category::getInstance(XMLTOOLING_LOGCAT".SecurityHelper").error("hash algorithm (%s) not available", hash);
+ Category::getInstance(XMLTOOLING_LOGCAT ".SecurityHelper").error("hash algorithm (%s) not available", hash);
return ret;
}
}
string ret;
if (cert.getProviderName()!=DSIGConstants::s_unicodeStrPROVOpenSSL) {
- Category::getInstance(XMLTOOLING_LOGCAT".SecurityHelper").warn("encoding of non-OpenSSL keys not supported");
+ Category::getInstance(XMLTOOLING_LOGCAT ".SecurityHelper").warn("encoding of non-OpenSSL keys not supported");
return ret;
}
if (hash) {
md = EVP_get_digestbyname(hash);
if (!md) {
- Category::getInstance(XMLTOOLING_LOGCAT".SecurityHelper").error("hash algorithm (%s) not available", hash);
+ Category::getInstance(XMLTOOLING_LOGCAT ".SecurityHelper").error("hash algorithm (%s) not available", hash);
return ret;
}
}
if (base64) {
decoded = xercesc::Base64::decode(reinterpret_cast<const XMLByte*>(buf), &x);
if (!decoded) {
- Category::getInstance(XMLTOOLING_LOGCAT".SecurityHelper").error("base64 decode failed");
+ Category::getInstance(XMLTOOLING_LOGCAT ".SecurityHelper").error("base64 decode failed");
return nullptr;
}
}
break;
#endif
default:
- Category::getInstance(XMLTOOLING_LOGCAT".SecurityHelper").error("unsupported public key type");
+ Category::getInstance(XMLTOOLING_LOGCAT ".SecurityHelper").error("unsupported public key type");
}
}
catch (XSECCryptoException& ex) {
- Category::getInstance(XMLTOOLING_LOGCAT".SecurityHelper").error(ex.getMsg());
+ Category::getInstance(XMLTOOLING_LOGCAT ".SecurityHelper").error(ex.getMsg());
}
EVP_PKEY_free(pkey);
return ret;
xsecsize_t x;
XMLByte* decoded = xercesc::Base64::decodeToXMLByte(buf, &x);
if (!decoded) {
- Category::getInstance(XMLTOOLING_LOGCAT".SecurityHelper").error("base64 decode failed");
+ Category::getInstance(XMLTOOLING_LOGCAT ".SecurityHelper").error("base64 decode failed");
return nullptr;
}
XSECCryptoKey* ret = fromDEREncoding((const char*)decoded, x, false);
}
}
catch (exception& ex) {
- logging::Category::getInstance(XMLTOOLING_LOGCAT".TrustEngine.StaticPKIX").error(ex.what());
+ logging::Category::getInstance(XMLTOOLING_LOGCAT ".TrustEngine.StaticPKIX").error(ex.what());
}
}
void XMLSecSignatureImpl::sign(const Credential* credential)
{
- Category& log=Category::getInstance(XMLTOOLING_LOGCAT".Signature");
+ Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".Signature");
log.debug("applying signature");
if (!m_signature)
xmltooling::NDC ndc("marshall");
#endif
- Category& log=Category::getInstance(XMLTOOLING_LOGCAT".XMLObject.Signature");
+ Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".XMLObject.Signature");
log.debug("marshalling ds:Signature");
DOMElement* cachedDOM=getDOM();
xmltooling::NDC ndc("marshall");
#endif
- Category& log=Category::getInstance(XMLTOOLING_LOGCAT".XMLObject.Signature");
+ Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".XMLObject.Signature");
log.debug("marshalling ds:Signature");
DOMElement* cachedDOM=getDOM();
XMLObject* XMLSecSignatureImpl::unmarshall(DOMElement* element, bool bindDocument)
{
- Category::getInstance(XMLTOOLING_LOGCAT".XMLObject.Signature").debug("unmarshalling ds:Signature");
+ Category::getInstance(XMLTOOLING_LOGCAT ".XMLObject.Signature").debug("unmarshalling ds:Signature");
try {
m_signature=XMLToolingInternalConfig::getInternalConfig().m_xsecProvider->newSignatureFromDOM(
{
public:
CURLPool() : m_size(0), m_lock(Mutex::create()),
- m_log(Category::getInstance(XMLTOOLING_LOGCAT".SOAPTransport.CURL")) {}
+ m_log(Category::getInstance(XMLTOOLING_LOGCAT ".SOAPTransport.CURL")) {}
~CURLPool();
CURL* get(const SOAPTransport::Address& addr);
#ifdef _DEBUG
xmltooling::NDC ndc("send");
#endif
- Category& log=Category::getInstance(XMLTOOLING_LOGCAT".SOAPTransport.CURL");
- Category& log_curl=Category::getInstance(XMLTOOLING_LOGCAT".libcurl");
+ Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".SOAPTransport.CURL");
+ Category& log_curl=Category::getInstance(XMLTOOLING_LOGCAT ".libcurl");
// For this implementation, it's sufficient to check for https as a sign of transport security.
if (m_mandatory && !isConfidential())
#ifndef XMLTOOLING_NO_XMLSEC
int xmltooling::verify_callback(X509_STORE_CTX* x509_ctx, void* arg)
{
- Category& log=Category::getInstance(XMLTOOLING_LOGCAT".SOAPTransport.CURL");
+ Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".SOAPTransport.CURL");
log.debug("invoking custom X.509 verify callback");
#if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
CURLSOAPTransport* ctx = reinterpret_cast<CURLSOAPTransport*>(arg);
m_transport = XMLToolingConfig::getConfig().SOAPTransportManager.newPlugin(scheme.c_str(), addr);
prepareTransport(*m_transport);
- Category& log = Category::getInstance(XMLTOOLING_LOGCAT".SOAPClient");
+ Category& log = Category::getInstance(XMLTOOLING_LOGCAT ".SOAPClient");
if (log.isDebugEnabled())
log.debugStream() << "marshalled envelope:\n" << env << logging::eol;
: XMLToolingConfig::getConfig().getParser()).parse(out);
XercesJanitor<DOMDocument> janitor(doc);
- Category& log = Category::getInstance(XMLTOOLING_LOGCAT".SOAPClient");
+ Category& log = Category::getInstance(XMLTOOLING_LOGCAT ".SOAPClient");
if (log.isDebugEnabled()) {
string buf;
XMLHelper::serialize(doc->getDocumentElement(), buf);
{
const xmltooling::QName* code = (fault.getFaultcode() ? fault.getFaultcode()->getCode() : nullptr);
auto_ptr_char str((fault.getFaultstring() ? fault.getFaultstring()->getString() : nullptr));
- Category::getInstance(XMLTOOLING_LOGCAT".SOAPClient").error(
+ Category::getInstance(XMLTOOLING_LOGCAT ".SOAPClient").error(
"SOAP client detected a Fault: (%s) (%s)",
(code ? code->toString().c_str() : "no code"),
(str.get() ? str.get() : "no message")
}
CurlURLInputStream::CurlURLInputStream(const char* url, string* cacheTag)
- : fLog(logging::Category::getInstance(XMLTOOLING_LOGCAT".libcurl.InputStream"))
+ : fLog(logging::Category::getInstance(XMLTOOLING_LOGCAT ".libcurl.InputStream"))
, fCacheTag(cacheTag)
, fURL(url ? url : "")
, fOpenSSLOps(SSL_OP_ALL|SSL_OP_NO_SSLv2)
}
CurlURLInputStream::CurlURLInputStream(const XMLCh* url, string* cacheTag)
- : fLog(logging::Category::getInstance(XMLTOOLING_LOGCAT".libcurl.InputStream"))
+ : fLog(logging::Category::getInstance(XMLTOOLING_LOGCAT ".libcurl.InputStream"))
, fCacheTag(cacheTag)
, fOpenSSLOps(SSL_OP_ALL|SSL_OP_NO_SSLv2)
, fMulti(0)
}
CurlURLInputStream::CurlURLInputStream(const DOMElement* e, string* cacheTag)
- : fLog(logging::Category::getInstance(XMLTOOLING_LOGCAT".libcurl.InputStream"))
+ : fLog(logging::Category::getInstance(XMLTOOLING_LOGCAT ".libcurl.InputStream"))
, fCacheTag(cacheTag)
, fOpenSSLOps(SSL_OP_ALL|SSL_OP_NO_SSLv2)
, fMulti(0)
#ifdef _DEBUG
xmltooling::NDC ndc("handleError");
#endif
- Category& log=Category::getInstance(XMLTOOLING_LOGCAT".ParserPool");
+ Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".ParserPool");
DOMLocator* locator=e.getLocation();
auto_ptr_char temp(e.getMessage());
#if _DEBUG
xmltooling::NDC ndc("loadSchema");
#endif
- Category& log=Category::getInstance(XMLTOOLING_LOGCAT".ParserPool");
+ Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".ParserPool");
auto_ptr_char n(nsURI);
log.error("failed to load schema for (%s), file not found (%s)",n.get(),p.get());
return false;
#if _DEBUG
xmltooling::NDC ndc("loadCatalog");
#endif
- Category& log=Category::getInstance(XMLTOOLING_LOGCAT".ParserPool");
+ Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".ParserPool");
// XML constants
static const XMLCh catalog[] = UNICODE_LITERAL_7(c,a,t,a,l,o,g);
return nullptr;
xstring sysId(systemId);
- Category& log=Category::getInstance(XMLTOOLING_LOGCAT".ParserPool");
+ Category& log=Category::getInstance(XMLTOOLING_LOGCAT ".ParserPool");
if (log.isDebugEnabled()) {
auto_ptr_char sysId(systemId);
auto_ptr_char base(baseURI);
bytes_read+=m_is.gcount();
}
catch(ios_base::failure& e) {
- Category::getInstance(XMLTOOLING_LOGCAT".StreamInputSource").critStream()
+ Category::getInstance(XMLTOOLING_LOGCAT ".StreamInputSource").critStream()
<< "XML::StreamInputSource::StreamBinInputStream::readBytes caught an exception: " << e.what()
<< logging::eol;
*toFill=0;
{
if (strlen(context) > m_storageCaps.getContextSize()) {
// This is a design/coding failure.
- Category::getInstance(XMLTOOLING_LOGCAT".ReplayCache").error(
+ Category::getInstance(XMLTOOLING_LOGCAT ".ReplayCache").error(
"context (%s) too long for StorageService (limit %u)", context, m_storageCaps.getContextSize()
);
return false;
m_storage->createString(context, h.c_str(), "x", expires);
return true;
#else
- Category::getInstance(XMLTOOLING_LOGCAT".ReplayCache").error(
+ Category::getInstance(XMLTOOLING_LOGCAT ".ReplayCache").error(
"key (%s) too long for StorageService (limit %u)", s, m_storageCaps.getKeySize()
);
return false;
static int XMLTOOL_DLLLOCAL map_windows_error_status_to_pthreads(int rc=0) {
if(rc!=0) // success?
return 0;
- Category::getInstance(XMLTOOLING_LOGCAT".Threads").error("error from thread operation (%d)", GetLastError());
+ Category::getInstance(XMLTOOLING_LOGCAT ".Threads").error("error from thread operation (%d)", GetLastError());
return THREAD_ERROR;
}