projects
/
shibboleth
/
cpp-xmltooling.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revised decryption APIs to clarify CredentialResolver/KeyResolver difference.
[shibboleth/cpp-xmltooling.git]
/
xmltooling
/
security
/
CredentialResolver.h
diff --git
a/xmltooling/security/CredentialResolver.h
b/xmltooling/security/CredentialResolver.h
index
0317299
..
a9324ee
100644
(file)
--- a/
xmltooling/security/CredentialResolver.h
+++ b/
xmltooling/security/CredentialResolver.h
@@
-29,6
+29,10
@@
#include <xsec/enc/XSECCryptoKey.hpp>
#include <xsec/enc/XSECCryptoX509.hpp>
#include <xsec/enc/XSECCryptoKey.hpp>
#include <xsec/enc/XSECCryptoX509.hpp>
+namespace xmlsignature {
+ class XMLTOOL_API KeyInfo;
+};
+
namespace xmltooling {
/**
namespace xmltooling {
/**
@@
-44,12
+48,13
@@
namespace xmltooling {
virtual ~CredentialResolver() {}
/**
virtual ~CredentialResolver() {}
/**
- * Returns a secret or private key to use for signing operations.
+ * Returns a secret or private key to use for signing o
r decryption o
perations.
* The caller is responsible for deleting the key when finished with it.
*
* The caller is responsible for deleting the key when finished with it.
*
+ * @param keyInfo optional material identifying a decryption key
* @return a secret or private key
*/
* @return a secret or private key
*/
- virtual XSECCryptoKey* getKey() const=0;
+ virtual XSECCryptoKey* getKey(
const xmlsignature::KeyInfo* keyInfo=NULL
) const=0;
/**
* Returns a set of certificates to publish during signing operations.
/**
* Returns a set of certificates to publish during signing operations.