Moved key/cred resolution classes out of xmlsig namespace.

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

diff --git a/xmltooling/encryption/Decrypter.h b/xmltooling/encryption/Decrypter.h
index 19a245b..5abac55 100644 (file)
--- a/xmltooling/encryption/Decrypter.h
+++ b/xmltooling/encryption/Decrypter.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2006 Internet2
+ *  Copyright 2001-2007 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,16 +15,16 @@
  */
 
 /**
- * @file Encrypter.h
+ * @file xmltooling/encryption/Decrypter.h
  * 
- * Methods for encrypting XMLObjects and other data.
+ * Wrapper API for XML Decryption functionality.
  */
 
 #if !defined(__xmltooling_decrypter_h__) && !defined(XMLTOOLING_NO_XMLSEC)
 #define __xmltooling_decrypter_h__
 
 #include <xmltooling/encryption/Encryption.h>
-#include <xmltooling/signature/KeyResolver.h>
+#include <xmltooling/security/KeyResolver.h>
 
 #include <xsec/enc/XSECCryptoKey.hpp>
 #include <xsec/xenc/XENCCipher.hpp>
@@ -41,21 +41,21 @@ namespace xmlencryption {
          * Constructor.
          * Resolvers will be deleted when Decrypter is.
          * 
-         * @param KEKresolver   resolves key decryption key based on KeyInfo information 
-         * @param resolver      resolves data decryption key based on KeyInfo information 
+         * @param KEKresolver   resolves key decryption key
+         * @param resolver      resolves data decryption key
          */
-        Decrypter(xmlsignature::KeyResolver* KEKresolver=NULL, xmlsignature::KeyResolver* resolver=NULL)
+        Decrypter(xmltooling::KeyResolver* KEKresolver=NULL, xmltooling::KeyResolver* resolver=NULL)
             : m_cipher(NULL), m_resolver(resolver), m_KEKresolver(KEKresolver) {
         }
 
         ~Decrypter();
         
         /**
-         * Replace the current KeyResolver interface, if any, with a new one.
+         * Replace the current data encryption KeyResolver interface, if any, with a new one.
          * 
          * @param resolver  the KeyResolver to attach 
          */
-        void setKeyResolver(xmlsignature::KeyResolver* resolver) {
+        void setKeyResolver(xmltooling::KeyResolver* resolver) {
             delete m_resolver;
             m_resolver=resolver;
         }
@@ -65,7 +65,7 @@ namespace xmlencryption {
          * 
          * @param resolver  the KeyResolver to attach 
          */
-        void setKEKResolver(xmlsignature::KeyResolver* resolver) {
+        void setKEKResolver(xmltooling::KeyResolver* resolver) {
             delete m_KEKresolver;
             m_KEKresolver=resolver;
         }
@@ -100,8 +100,8 @@ namespace xmlencryption {
         
     private:
         XENCCipher* m_cipher;
-        xmlsignature::KeyResolver* m_resolver;
-        xmlsignature::KeyResolver* m_KEKresolver;
+        xmltooling::KeyResolver* m_resolver;
+        xmltooling::KeyResolver* m_KEKresolver;
     };
 
     DECL_XMLTOOLING_EXCEPTION(DecryptionException,XMLTOOL_EXCEPTIONAPI(XMLTOOL_API),xmlencryption,xmltooling::XMLToolingException,Exceptions in decryption processing);