projects
/
shibboleth
/
opensaml2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Major revamp of credential and trust handling code, PKIX engine still needs work.
[shibboleth/opensaml2.git]
/
saml
/
encryption
/
EncryptedKeyResolver.h
diff --git
a/saml/encryption/EncryptedKeyResolver.h
b/saml/encryption/EncryptedKeyResolver.h
index
51f74ba
..
8063c1c
100644
(file)
--- a/
saml/encryption/EncryptedKeyResolver.h
+++ b/
saml/encryption/EncryptedKeyResolver.h
@@
-24,11
+24,14
@@
#define __saml_enckeyres_h__
#include <saml/base.h>
#define __saml_enckeyres_h__
#include <saml/base.h>
-#include <saml/saml2/core/Assertions.h>
#include <xmltooling/encryption/EncryptedKeyResolver.h>
namespace opensaml {
#include <xmltooling/encryption/EncryptedKeyResolver.h>
namespace opensaml {
+ namespace saml2 {
+ class SAML_API EncryptedElementType;
+ };
+
/**
* SAML-specific encrypted key resolver.
*
/**
* SAML-specific encrypted key resolver.
*
@@
-38,19
+41,15
@@
namespace opensaml {
class SAML_API EncryptedKeyResolver : public xmlencryption::EncryptedKeyResolver
{
public:
class SAML_API EncryptedKeyResolver : public xmlencryption::EncryptedKeyResolver
{
public:
- EncryptedKeyResolver(const saml2::EncryptedElementType& ref, const XMLCh* recipient=NULL)
- : m_ref(ref), m_recipient(XMLString::replicate(recipient)) {
+ EncryptedKeyResolver(const saml2::EncryptedElementType& ref) : m_ref(ref) {
}
}
- virtual ~EncryptedKeyResolver() {
- XMLString::release(&m_recipient);
- }
+ virtual ~EncryptedKeyResolver() {}
-
xmlencryption::EncryptedKey* resolveKey(xmlencryption::EncryptedData& encryptedData
) const;
+
const xmlencryption::EncryptedKey* resolveKey(const xmlencryption::EncryptedData& encryptedData, const XMLCh* recipient=NULL
) const;
protected:
const saml2::EncryptedElementType& m_ref;
protected:
const saml2::EncryptedElementType& m_ref;
- XMLCh* m_recipient;
};
};
};
};