X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fsaml2%2Fcore%2FAssertions.h;fp=saml%2Fsaml2%2Fcore%2FAssertions.h;h=31d11cff069a8229e1c9b00a6bf95b55d265340e;hb=c77019168bb64c2a5271f55e76addc508e94948f;hp=9faaa8b5c4506a69b0ec511aac18ca2bededc604;hpb=1358ecc315370a4dc0c02b941195919ca2bbd4c3;p=shibboleth%2Fcpp-opensaml.git

diff --git a/saml/saml2/core/Assertions.h b/saml/saml2/core/Assertions.h
index 9faaa8b..31d11cf 100644
--- 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/security/KeyResolver.h>
+#include <xmltooling/security/CredentialResolver.h>
 #include <xmltooling/signature/Signature.h>
 #include <xmltooling/util/DateTime.h>
 
@@ -65,13 +65,13 @@ namespace opensaml {
              * inside the message. The key decryption key should be supplied using the provided
              * resolver. The recipient name may be used when multiple encrypted keys are found.
              * The object returned will be unmarshalled around the decrypted DOM element, but the
-             * DOM itself will be released. 
+             * DOM itself will be released.
              * 
-             * @param KEKresolver   resolver supplying key decryption key
+             * @param KEKresolver   locked resolver supplying key decryption key
              * @param recipient     identifier naming the recipient (the entity performing the decryption)
              * @return  the decrypted and unmarshalled object
              */
-            virtual xmltooling::XMLObject* decrypt(xmltooling::KeyResolver* KEKresolver, const XMLCh* recipient) const=0;
+            virtual xmltooling::XMLObject* decrypt(const xmltooling::CredentialResolver* KEKresolver, const XMLCh* recipient) const=0;
         END_XMLOBJECT;
 
         BEGIN_XMLOBJECT(SAML_API,EncryptedID,EncryptedElementType,SAML 2.0 EncryptedID element);