Major revamp of credential and trust handling code, PKIX engine still needs work.

[shibboleth/cpp-xmltooling.git] / xmltooling / encryption / EncryptedKeyResolver.h

diff --git a/xmltooling/encryption/EncryptedKeyResolver.h b/xmltooling/encryption/EncryptedKeyResolver.h
index 1e22a42..440c465 100644 (file)
--- a/xmltooling/encryption/EncryptedKeyResolver.h
+++ b/xmltooling/encryption/EncryptedKeyResolver.h
@@ -24,24 +24,26 @@
 #define __xmltooling_enckeyres_h__
 
 #include <xmltooling/encryption/Encryption.h>
-#include <xmltooling/signature/KeyResolver.h>
 
 namespace xmlencryption {
 
     /**
      * An API for resolving encrypted decryption keys.
      */
-    class XMLTOOL_API EncryptedKeyResolver : public xmlsignature::KeyResolver {
+    class XMLTOOL_API EncryptedKeyResolver {
+        MAKE_NONCOPYABLE(EncryptedKeyResolver);
     public:
+        EncryptedKeyResolver() {}
         virtual ~EncryptedKeyResolver() {}
         
         /**
-         * Returns an encrypted key based on the supplied KeyInfo information.
+         * Returns an encrypted key based on the supplied object's KeyInfo information.
          * 
          * @param encryptedData an encrypted object
+         * @param recipient identifier of recipient of encrypted key
          * @return  the resolved EncryptedKey object
          */
-        virtual EncryptedKey* resolveKey(EncryptedData* encryptedData)=0;
+        virtual const EncryptedKey* resolveKey(const EncryptedData& encryptedData, const XMLCh* recipient=NULL) const;
     };
 
 };