propagate from branch 'net.randombit.botan.1_8' (head ef51dd2869ed38dae3aeb1c3b931ca9d595580e1)

            to branch 'net.randombit.botan' (head fc1942640045423f411fd865cbd584090b28d7eb)

1 files changed, 39 insertions, 29 deletions

diff --git a/src/modes/ecb/ecb.h b/src/modes/ecb/ecb.h
index 5230f9b14..ff9ea9635 100644
--- a/src/modes/ecb/ecb.h
+++ b/src/modes/ecb/ecb.h
@@ -1,6 +1,6 @@
 /*
 * ECB Mode
-* (C) 1999-2007 Jack Lloyd
+* (C) 1999-2009 Jack Lloyd
 *
 * Distributed under the terms of the Botan license
 */
@@ -8,64 +8,74 @@
 #ifndef BOTAN_ECB_H__
 #define BOTAN_ECB_H__
 
-#include <botan/modebase.h>
-#include <botan/mode_pad.h>
+#include <botan/basefilt.h>
 #include <botan/block_cipher.h>
+#include <botan/mode_pad.h>
 
-namespace Botan {
-
-/*
-* ECB
-*/
-class BOTAN_DLL ECB : public BlockCipherMode
-   {
-   protected:
-      ECB(BlockCipher* ciph, BlockCipherModePaddingMethod* pad) :
-         BlockCipherMode(ciph, "ECB", 0), padder(pad) {}
-      ~ECB() { delete padder; }
+#include <botan/modebase.h>
 
-      std::string name() const;
-      BlockCipherModePaddingMethod* padder;
-   private:
-      bool valid_iv_size(u32bit) const;
-   };
+namespace Botan {
 
 /*
 * ECB Encryption
 */
-class BOTAN_DLL ECB_Encryption : public ECB
+class BOTAN_DLL ECB_Encryption : public Keyed_Filter
    {
    public:
+      std::string name() const;
+
+      void set_key(const SymmetricKey& key) { cipher->set_key(key); }
+
+      bool valid_keylength(u32bit key_len) const
+         { return cipher->valid_keylength(key_len); }
+
       ECB_Encryption(BlockCipher* ciph,
-                     BlockCipherModePaddingMethod* pad) :
-         ECB(ciph, pad) {}
+                     BlockCipherModePaddingMethod* pad);
 
       ECB_Encryption(BlockCipher* ciph,
                      BlockCipherModePaddingMethod* pad,
-                     const SymmetricKey& key) :
-         ECB(ciph, pad) { set_key(key); }
+                     const SymmetricKey& key);
+
+      ~ECB_Encryption();
    private:
       void write(const byte[], u32bit);
       void end_msg();
+
+      BlockCipher* cipher;
+      BlockCipherModePaddingMethod* padder;
+      SecureVector<byte> plaintext, ciphertext;
+      u32bit position;
    };
 
 /*
 * ECB Decryption
 */
-class BOTAN_DLL ECB_Decryption : public ECB
+class BOTAN_DLL ECB_Decryption : public Keyed_Filter
    {
    public:
+      std::string name() const;
+
+      void set_key(const SymmetricKey& key) { cipher->set_key(key); }
+
+      bool valid_keylength(u32bit key_len) const
+         { return cipher->valid_keylength(key_len); }
+
       ECB_Decryption(BlockCipher* ciph,
-                     BlockCipherModePaddingMethod* pad) :
-         ECB(ciph, pad) {}
+                     BlockCipherModePaddingMethod* pad);
 
       ECB_Decryption(BlockCipher* ciph,
                      BlockCipherModePaddingMethod* pad,
-                     const SymmetricKey& key) :
-         ECB(ciph, pad) { set_key(key); }
+                     const SymmetricKey& key);
+
+      ~ECB_Decryption();
    private:
       void write(const byte[], u32bit);
       void end_msg();
+
+      BlockCipher* cipher;
+      BlockCipherModePaddingMethod* padder;
+      SecureVector<byte> plaintext, ciphertext;
+      u32bit position;
    };
 
 }