projects
/
shibboleth
/
cpp-opensaml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
af7f1ef
)
Moved key/cred resolution classes out of xmlsig namespace.
author
Scott Cantor
<cantor.2@osu.edu>
Fri, 2 Mar 2007 02:38:32 +0000
(
02:38
+0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Fri, 2 Mar 2007 02:38:32 +0000
(
02:38
+0000)
14 files changed:
saml/binding/MessageEncoder.h
patch
|
blob
|
history
saml/saml1/binding/SAML1ArtifactEncoder.h
patch
|
blob
|
history
saml/saml1/binding/SAML1POSTEncoder.h
patch
|
blob
|
history
saml/saml1/binding/SAML1SOAPEncoder.h
patch
|
blob
|
history
saml/saml2/binding/SAML2ArtifactEncoder.h
patch
|
blob
|
history
saml/saml2/binding/SAML2POSTEncoder.h
patch
|
blob
|
history
saml/saml2/binding/SAML2RedirectEncoder.h
patch
|
blob
|
history
saml/saml2/binding/SAML2SOAPEncoder.h
patch
|
blob
|
history
saml/saml2/core/Assertions.h
patch
|
blob
|
history
saml/saml2/metadata/AbstractMetadataProvider.h
patch
|
blob
|
history
saml/saml2/metadata/ChainingMetadataProvider.h
patch
|
blob
|
history
saml/saml2/metadata/MetadataProvider.h
patch
|
blob
|
history
saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
patch
|
blob
|
history
samltest/signature/SAMLSignatureTestBase.h
patch
|
blob
|
history
diff --git
a/saml/binding/MessageEncoder.h
b/saml/binding/MessageEncoder.h
index
b60dfb2
..
d5e987b
100644
(file)
--- a/
saml/binding/MessageEncoder.h
+++ b/
saml/binding/MessageEncoder.h
@@
-27,7
+27,7
@@
#include <istream>
#include <xmltooling/XMLObject.h>
#include <istream>
#include <xmltooling/XMLObject.h>
-#include <xmltooling/s
ignature
/CredentialResolver.h>
+#include <xmltooling/s
ecurity
/CredentialResolver.h>
namespace opensaml {
namespace opensaml {
@@
-116,7
+116,7
@@
namespace opensaml {
const char* destination,
const char* recipientID=NULL,
const char* relayState=NULL,
const char* destination,
const char* recipientID=NULL,
const char* relayState=NULL,
- const xml
signature
::CredentialResolver* credResolver=NULL,
+ const xml
tooling
::CredentialResolver* credResolver=NULL,
const XMLCh* sigAlgorithm=NULL
) const=0;
const XMLCh* sigAlgorithm=NULL
) const=0;
@@
-132,7
+132,7
@@
namespace opensaml {
* @return a new Signature object
*/
xmlsignature::Signature* buildSignature(
* @return a new Signature object
*/
xmlsignature::Signature* buildSignature(
- const xml
signature
::CredentialResolver* credResolver,
+ const xml
tooling
::CredentialResolver* credResolver,
const XMLCh* sigAlgorithm=NULL
) const;
const XMLCh* sigAlgorithm=NULL
) const;
diff --git
a/saml/saml1/binding/SAML1ArtifactEncoder.h
b/saml/saml1/binding/SAML1ArtifactEncoder.h
index
4d8707d
..
f4194b8
100644
(file)
--- a/
saml/saml1/binding/SAML1ArtifactEncoder.h
+++ b/
saml/saml1/binding/SAML1ArtifactEncoder.h
@@
-41,7
+41,7
@@
namespace opensaml {
const char* destination,
const char* recipientID=NULL,
const char* relayState=NULL,
const char* destination,
const char* recipientID=NULL,
const char* relayState=NULL,
- const xml
signature
::CredentialResolver* credResolver=NULL,
+ const xml
tooling
::CredentialResolver* credResolver=NULL,
const XMLCh* sigAlgorithm=NULL
) const;
};
const XMLCh* sigAlgorithm=NULL
) const;
};
diff --git
a/saml/saml1/binding/SAML1POSTEncoder.h
b/saml/saml1/binding/SAML1POSTEncoder.h
index
de3a9cd
..
ec96683
100644
(file)
--- a/
saml/saml1/binding/SAML1POSTEncoder.h
+++ b/
saml/saml1/binding/SAML1POSTEncoder.h
@@
-41,7
+41,7
@@
namespace opensaml {
const char* destination,
const char* recipientID=NULL,
const char* relayState=NULL,
const char* destination,
const char* recipientID=NULL,
const char* relayState=NULL,
- const xml
signature
::CredentialResolver* credResolver=NULL,
+ const xml
tooling
::CredentialResolver* credResolver=NULL,
const XMLCh* sigAlgorithm=NULL
) const;
const XMLCh* sigAlgorithm=NULL
) const;
diff --git
a/saml/saml1/binding/SAML1SOAPEncoder.h
b/saml/saml1/binding/SAML1SOAPEncoder.h
index
e982c5f
..
6501576
100644
(file)
--- a/
saml/saml1/binding/SAML1SOAPEncoder.h
+++ b/
saml/saml1/binding/SAML1SOAPEncoder.h
@@
-41,7
+41,7
@@
namespace opensaml {
const char* destination,
const char* recipientID=NULL,
const char* relayState=NULL,
const char* destination,
const char* recipientID=NULL,
const char* relayState=NULL,
- const xml
signature
::CredentialResolver* credResolver=NULL,
+ const xml
tooling
::CredentialResolver* credResolver=NULL,
const XMLCh* sigAlgorithm=NULL
) const;
};
const XMLCh* sigAlgorithm=NULL
) const;
};
diff --git
a/saml/saml2/binding/SAML2ArtifactEncoder.h
b/saml/saml2/binding/SAML2ArtifactEncoder.h
index
871614e
..
518c779
100644
(file)
--- a/
saml/saml2/binding/SAML2ArtifactEncoder.h
+++ b/
saml/saml2/binding/SAML2ArtifactEncoder.h
@@
-41,7
+41,7
@@
namespace opensaml {
const char* destination,
const char* recipientID=NULL,
const char* relayState=NULL,
const char* destination,
const char* recipientID=NULL,
const char* relayState=NULL,
- const xml
signature
::CredentialResolver* credResolver=NULL,
+ const xml
tooling
::CredentialResolver* credResolver=NULL,
const XMLCh* sigAlgorithm=NULL
) const;
const XMLCh* sigAlgorithm=NULL
) const;
diff --git
a/saml/saml2/binding/SAML2POSTEncoder.h
b/saml/saml2/binding/SAML2POSTEncoder.h
index
0bfec5f
..
b2af656
100644
(file)
--- a/
saml/saml2/binding/SAML2POSTEncoder.h
+++ b/
saml/saml2/binding/SAML2POSTEncoder.h
@@
-41,7
+41,7
@@
namespace opensaml {
const char* destination,
const char* recipientID=NULL,
const char* relayState=NULL,
const char* destination,
const char* recipientID=NULL,
const char* relayState=NULL,
- const xml
signature
::CredentialResolver* credResolver=NULL,
+ const xml
tooling
::CredentialResolver* credResolver=NULL,
const XMLCh* sigAlgorithm=NULL
) const;
const XMLCh* sigAlgorithm=NULL
) const;
diff --git
a/saml/saml2/binding/SAML2RedirectEncoder.h
b/saml/saml2/binding/SAML2RedirectEncoder.h
index
82fdba5
..
7e7b06e
100644
(file)
--- a/
saml/saml2/binding/SAML2RedirectEncoder.h
+++ b/
saml/saml2/binding/SAML2RedirectEncoder.h
@@
-41,7
+41,7
@@
namespace opensaml {
const char* destination,
const char* recipientID=NULL,
const char* relayState=NULL,
const char* destination,
const char* recipientID=NULL,
const char* relayState=NULL,
- const xml
signature
::CredentialResolver* credResolver=NULL,
+ const xml
tooling
::CredentialResolver* credResolver=NULL,
const XMLCh* sigAlgorithm=NULL
) const;
};
const XMLCh* sigAlgorithm=NULL
) const;
};
diff --git
a/saml/saml2/binding/SAML2SOAPEncoder.h
b/saml/saml2/binding/SAML2SOAPEncoder.h
index
5959507
..
05ca6ae
100644
(file)
--- a/
saml/saml2/binding/SAML2SOAPEncoder.h
+++ b/
saml/saml2/binding/SAML2SOAPEncoder.h
@@
-41,7
+41,7
@@
namespace opensaml {
const char* destination,
const char* recipientID=NULL,
const char* relayState=NULL,
const char* destination,
const char* recipientID=NULL,
const char* relayState=NULL,
- const xml
signature
::CredentialResolver* credResolver=NULL,
+ const xml
tooling
::CredentialResolver* credResolver=NULL,
const XMLCh* sigAlgorithm=NULL
) const;
};
const XMLCh* sigAlgorithm=NULL
) const;
};
diff --git
a/saml/saml2/core/Assertions.h
b/saml/saml2/core/Assertions.h
index
b77efa1
..
6a5ed55
100644
(file)
--- a/
saml/saml2/core/Assertions.h
+++ b/
saml/saml2/core/Assertions.h
@@
-28,7
+28,7
@@
#include <xmltooling/XMLObjectBuilder.h>
#include <xmltooling/encryption/Encryption.h>
#include <xmltooling/XMLObjectBuilder.h>
#include <xmltooling/encryption/Encryption.h>
-#include <xmltooling/s
ignature
/KeyResolver.h>
+#include <xmltooling/s
ecurity
/KeyResolver.h>
#include <xmltooling/signature/Signature.h>
#include <xmltooling/util/DateTime.h>
#include <xmltooling/signature/Signature.h>
#include <xmltooling/util/DateTime.h>
@@
-71,7
+71,7
@@
namespace opensaml {
* @param recipient identifier naming the recipient (the entity performing the decryption)
* @return the decrypted and unmarshalled object
*/
* @param recipient identifier naming the recipient (the entity performing the decryption)
* @return the decrypted and unmarshalled object
*/
- virtual xmltooling::XMLObject* decrypt(xml
signature
::KeyResolver* KEKresolver, const XMLCh* recipient) const=0;
+ virtual xmltooling::XMLObject* decrypt(xml
tooling
::KeyResolver* KEKresolver, const XMLCh* recipient) const=0;
END_XMLOBJECT;
BEGIN_XMLOBJECT(SAML_API,EncryptedID,EncryptedElementType,SAML 2.0 EncryptedID element);
END_XMLOBJECT;
BEGIN_XMLOBJECT(SAML_API,EncryptedID,EncryptedElementType,SAML 2.0 EncryptedID element);
diff --git
a/saml/saml2/metadata/AbstractMetadataProvider.h
b/saml/saml2/metadata/AbstractMetadataProvider.h
index
4a7ac9f
..
c0bc64b
100644
(file)
--- a/
saml/saml2/metadata/AbstractMetadataProvider.h
+++ b/
saml/saml2/metadata/AbstractMetadataProvider.h
@@
-58,7
+58,7
@@
namespace opensaml {
public:
virtual ~AbstractMetadataProvider();
public:
virtual ~AbstractMetadataProvider();
- virtual const xml
signature
::KeyResolver* getKeyResolver() const {
+ virtual const xml
tooling
::KeyResolver* getKeyResolver() const {
return m_resolver;
}
return m_resolver;
}
@@
-68,7
+68,7
@@
namespace opensaml {
protected:
/** Embedded KeyResolver instance. */
protected:
/** Embedded KeyResolver instance. */
- xml
signature
::KeyResolver* m_resolver;
+ xml
tooling
::KeyResolver* m_resolver;
/**
* Loads an entity into the cache for faster lookup. This includes
/**
* Loads an entity into the cache for faster lookup. This includes
diff --git
a/saml/saml2/metadata/ChainingMetadataProvider.h
b/saml/saml2/metadata/ChainingMetadataProvider.h
index
19c1136
..
4c4e089
100644
(file)
--- a/
saml/saml2/metadata/ChainingMetadataProvider.h
+++ b/
saml/saml2/metadata/ChainingMetadataProvider.h
@@
-84,7
+84,7
@@
namespace opensaml {
xmltooling::Lockable* lock();
void unlock();
void init();
xmltooling::Lockable* lock();
void unlock();
void init();
- const xml
signature
::KeyResolver* getKeyResolver() const;
+ const xml
tooling
::KeyResolver* getKeyResolver() const;
const xmltooling::XMLObject* getMetadata() const;
const EntitiesDescriptor* getEntitiesDescriptor(const char* name, bool requireValidMetadata=true) const;
const EntityDescriptor* getEntityDescriptor(const char* id, bool requireValidMetadata=true) const;
const xmltooling::XMLObject* getMetadata() const;
const EntitiesDescriptor* getEntitiesDescriptor(const char* name, bool requireValidMetadata=true) const;
const EntityDescriptor* getEntityDescriptor(const char* id, bool requireValidMetadata=true) const;
diff --git
a/saml/saml2/metadata/MetadataProvider.h
b/saml/saml2/metadata/MetadataProvider.h
index
6a5a2e9
..
7c927a1
100644
(file)
--- a/
saml/saml2/metadata/MetadataProvider.h
+++ b/
saml/saml2/metadata/MetadataProvider.h
@@
-26,7
+26,7
@@
#include <saml/saml2/metadata/MetadataFilter.h>
#include <xmltooling/Lockable.h>
#include <saml/saml2/metadata/MetadataFilter.h>
#include <xmltooling/Lockable.h>
-#include <xmltooling/s
ignature
/KeyResolver.h>
+#include <xmltooling/s
ecurity
/KeyResolver.h>
namespace opensaml {
namespace opensaml {
@@
-118,7
+118,7
@@
namespace opensaml {
*
* @return an associated KeyResolver, or NULL
*/
*
* @return an associated KeyResolver, or NULL
*/
- virtual const xml
signature
::KeyResolver* getKeyResolver() const=0;
+ virtual const xml
tooling
::KeyResolver* getKeyResolver() const=0;
/**
* Gets the entire metadata tree, after the registered filter has been applied.
/**
* Gets the entire metadata tree, after the registered filter has been applied.
diff --git
a/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
b/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
index
fde978a
..
aad86ed
100644
(file)
--- a/
saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
+++ b/
saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
@@
-26,7
+26,7
@@
#include "saml2/metadata/AbstractMetadataProvider.h"
#include <xercesc/util/XMLUniDefs.hpp>
#include "saml2/metadata/AbstractMetadataProvider.h"
#include <xercesc/util/XMLUniDefs.hpp>
-#include <xmltooling/s
ignature
/CachingKeyResolver.h>
+#include <xmltooling/s
ecurity
/CachingKeyResolver.h>
#include <xmltooling/util/XMLHelper.h>
using namespace opensaml::saml2md;
#include <xmltooling/util/XMLHelper.h>
using namespace opensaml::saml2md;
@@
-34,12
+34,12
@@
using namespace opensaml;
using namespace xmltooling;
using namespace std;
using namespace xmltooling;
using namespace std;
-static const XMLCh
GenericKeyResolver[] =
UNICODE_LITERAL_11(K,e,y,R,e,s,o,l,v,e,r);
-static const XMLCh type[] =
UNICODE_LITERAL_4(t,y,p,e);
+static const XMLCh
_KeyResolver[] =
UNICODE_LITERAL_11(K,e,y,R,e,s,o,l,v,e,r);
+static const XMLCh type[] = UNICODE_LITERAL_4(t,y,p,e);
AbstractMetadataProvider::AbstractMetadataProvider(const DOMElement* e) : ObservableMetadataProvider(e), m_resolver(NULL)
{
AbstractMetadataProvider::AbstractMetadataProvider(const DOMElement* e) : ObservableMetadataProvider(e), m_resolver(NULL)
{
- e = e ? XMLHelper::getFirstChildElement(e,
Generic
KeyResolver) : NULL;
+ e = e ? XMLHelper::getFirstChildElement(e,
_
KeyResolver) : NULL;
if (e) {
auto_ptr_char t(e->getAttributeNS(NULL,type));
if (t.get())
if (e) {
auto_ptr_char t(e->getAttributeNS(NULL,type));
if (t.get())
@@
-60,7
+60,7
@@
AbstractMetadataProvider::~AbstractMetadataProvider()
void AbstractMetadataProvider::emitChangeEvent()
{
void AbstractMetadataProvider::emitChangeEvent()
{
-
xmlsignature::CachingKeyResolver* ckr=dynamic_cast<xmlsignature::
CachingKeyResolver*>(m_resolver);
+
CachingKeyResolver* ckr=dynamic_cast<
CachingKeyResolver*>(m_resolver);
if (ckr)
ckr->clearCache();
ObservableMetadataProvider::emitChangeEvent();
if (ckr)
ckr->clearCache();
ObservableMetadataProvider::emitChangeEvent();
diff --git
a/samltest/signature/SAMLSignatureTestBase.h
b/samltest/signature/SAMLSignatureTestBase.h
index
88a93f0
..
2d40dab
100644
(file)
--- a/
samltest/signature/SAMLSignatureTestBase.h
+++ b/
samltest/signature/SAMLSignatureTestBase.h
@@
-17,7
+17,7
@@
#include "internal.h"
#include <saml/signature/SignatureProfileValidator.h>
#include "internal.h"
#include <saml/signature/SignatureProfileValidator.h>
-#include <xmltooling/s
ignature
/CredentialResolver.h>
+#include <xmltooling/s
ecurity
/CredentialResolver.h>
#include <xmltooling/signature/KeyInfo.h>
#include <xmltooling/signature/SignatureValidator.h>
#include <xmltooling/signature/KeyInfo.h>
#include <xmltooling/signature/SignatureValidator.h>