/*
- * Copyright 2001-2007 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.
/**
* SAMLConfig.cpp
*
- * Library configuration
+ * Library configuration.
*/
#include "internal.h"
#include <xmltooling/logging.h>
#include <xmltooling/XMLToolingConfig.h>
+#include <xmltooling/security/SecurityHelper.h>
#include <xmltooling/signature/Signature.h>
#include <xmltooling/util/NDC.h>
#include <xmltooling/util/PathResolver.h>
return g_config;
}
+SAMLConfig::SAMLConfig() : m_artifactMap(nullptr)
+{
+}
+
+SAMLConfig::~SAMLConfig()
+{
+}
+
+ArtifactMap* SAMLConfig::getArtifactMap() const
+{
+ return m_artifactMap;
+}
+
void SAMLConfig::setArtifactMap(ArtifactMap* artifactMap)
{
delete m_artifactMap;
MetadataProviderManager.deregisterFactories();
delete m_artifactMap;
- m_artifactMap = NULL;
+ m_artifactMap = nullptr;
if (termXMLTooling)
XMLToolingConfig::getConfig().term();
string SAMLInternalConfig::hashSHA1(const char* s, bool toHex)
{
- static char DIGITS[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-
- auto_ptr<XSECCryptoHash> hasher(XSECPlatformUtils::g_cryptoProvider->hashSHA1());
- if (hasher.get()) {
- unsigned char buf[21];
- hasher->hash(reinterpret_cast<unsigned char*>(const_cast<char*>(s)),strlen(s));
- if (hasher->finish(buf,20)==20) {
- string ret;
- if (toHex) {
- for (unsigned int i=0; i<20; i++) {
- ret+=(DIGITS[((unsigned char)(0xF0 & buf[i])) >> 4 ]);
- ret+=(DIGITS[0x0F & buf[i]]);
- }
- }
- else {
- for (unsigned int i=0; i<20; i++) {
- ret+=buf[i];
- }
- }
- return ret;
- }
- }
- throw XMLSecurityException("Unable to generate SHA-1 hash.");
+ return SecurityHelper::doHash("SHA1", s, strlen(s), toHex);
+}
+
+SignableObject::SignableObject()
+{
+}
+
+SignableObject::~SignableObject()
+{
+}
+
+RootObject::RootObject()
+{
+}
+
+RootObject::~RootObject()
+{
+}
+
+Assertion::Assertion()
+{
+}
+
+Assertion::~Assertion()
+{
}
using namespace saml2p;
void opensaml::annotateException(XMLToolingException* e, const EntityDescriptor* entity, const Status* status, bool rethrow)
{
- const RoleDescriptor* role = NULL;
+ const RoleDescriptor* role = nullptr;
if (entity) {
const list<XMLObject*>& roles=entity->getOrderedChildren();
for (list<XMLObject*>::const_iterator child=roles.begin(); !role && child!=roles.end(); ++child) {
role=dynamic_cast<RoleDescriptor*>(*child);
if (role && !role->isValid())
- role = NULL;
+ role = nullptr;
}
}
annotateException(e, role, status, rethrow);
|| XMLString::equals(ctype,ContactPerson::CONTACT_TECHNICAL))) {
GivenName* fname=(*c)->getGivenName();
SurName* lname=(*c)->getSurName();
- auto_ptr_char first(fname ? fname->getName() : NULL);
- auto_ptr_char last(lname ? lname->getName() : NULL);
+ auto_ptr_char first(fname ? fname->getName() : nullptr);
+ auto_ptr_char last(lname ? lname->getName() : nullptr);
if (first.get() && last.get()) {
string contact=string(first.get()) + ' ' + last.get();
e->addProperty("contactName",contact.c_str());
}
if (status) {
- auto_ptr_char sc(status->getStatusCode() ? status->getStatusCode()->getValue() : NULL);
+ auto_ptr_char sc(status->getStatusCode() ? status->getStatusCode()->getValue() : nullptr);
if (sc.get() && *sc.get())
e->addProperty("statusCode", sc.get());
if (status->getStatusCode()->getStatusCode()) {