Move ECB to Transformation API

6 files changed, 263 insertions, 2 deletions

diff --git a/src/modes/cbc/cbc.cpp b/src/modes/cbc/cbc.cpp
index 832f3af4d..65b78fbc5 100644
--- a/src/modes/cbc/cbc.cpp
+++ b/src/modes/cbc/cbc.cpp
@@ -31,7 +31,7 @@ void CBC_Mode::clear()
 
 std::string CBC_Mode::name() const
    {
-   return cipher().name() + "/CBC";
+   return cipher().name() + "/CBC/" + padding().name();
    }
 
 size_t CBC_Mode::update_granularity() const
diff --git a/src/modes/cbc/cbc.h b/src/modes/cbc/cbc.h
index d8b3d818d..8e3a72fd0 100644
--- a/src/modes/cbc/cbc.h
+++ b/src/modes/cbc/cbc.h
@@ -16,7 +16,7 @@
 namespace Botan {
 
 /**
-* CBC Mode. Only handles full blocks, padding is handled higher up
+* CBC Mode
 */
 class CBC_Mode : public Transformation
    {
diff --git a/src/modes/cbc/info.txt b/src/modes/cbc/info.txt
index 767d907b3..9bf948f02 100644
--- a/src/modes/cbc/info.txt
+++ b/src/modes/cbc/info.txt
@@ -1 +1,5 @@
 define MODE_CBC
+
+<requires>
+mode_pad
+</requires>
diff --git a/src/modes/ecb/ecb.cpp b/src/modes/ecb/ecb.cpp
new file mode 100644
index 000000000..8abf76433
--- /dev/null
+++ b/src/modes/ecb/ecb.cpp
@@ -0,0 +1,163 @@
+/*
+* ECB Mode
+* (C) 1999-2009,2013 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
+
+#include <botan/ecb.h>
+#include <botan/loadstor.h>
+#include <botan/internal/xor_buf.h>
+#include <botan/internal/rounding.h>
+
+namespace Botan {
+
+ECB_Mode::ECB_Mode(BlockCipher* cipher, BlockCipherModePaddingMethod* padding) :
+   m_cipher(cipher),
+   m_padding(padding)
+   {
+   if(!m_padding->valid_blocksize(cipher->block_size()))
+      throw std::invalid_argument("Padding " + m_padding->name() +
+                                  " cannot be used with " +
+                                  cipher->name() + "/ECB");
+   }
+
+void ECB_Mode::clear()
+   {
+   m_cipher->clear();
+   }
+
+std::string ECB_Mode::name() const
+   {
+   return cipher().name() + "/ECB/" + padding().name();
+   }
+
+size_t ECB_Mode::update_granularity() const
+   {
+   return cipher().parallel_bytes();
+   }
+
+Key_Length_Specification ECB_Mode::key_spec() const
+   {
+   return cipher().key_spec();
+   }
+
+size_t ECB_Mode::default_nonce_size() const
+   {
+   return 0;
+   }
+
+bool ECB_Mode::valid_nonce_length(size_t n) const
+   {
+   return (n == 0);
+   }
+
+void ECB_Mode::key_schedule(const byte key[], size_t length)
+   {
+   m_cipher->set_key(key, length);
+   }
+
+secure_vector<byte> ECB_Mode::start(const byte nonce[], size_t nonce_len)
+   {
+   if(!valid_nonce_length(nonce_len))
+      throw Invalid_IV_Length(name(), nonce_len);
+
+   return secure_vector<byte>();
+   }
+
+size_t ECB_Encryption::minimum_final_size() const
+   {
+   return 0;
+   }
+
+size_t ECB_Encryption::output_length(size_t input_length) const
+   {
+   return round_up(input_length, cipher().block_size());
+   }
+
+void ECB_Encryption::update(secure_vector<byte>& buffer, size_t offset)
+   {
+   BOTAN_ASSERT(buffer.size() >= offset, "Offset is sane");
+   const size_t sz = buffer.size() - offset;
+   byte* buf = &buffer[offset];
+
+   const size_t BS = cipher().block_size();
+
+   BOTAN_ASSERT(sz % BS == 0, "ECB input is full blocks");
+   const size_t blocks = sz / BS;
+
+   cipher().encrypt_n(&buf[0], &buf[0], blocks);
+   }
+
+void ECB_Encryption::finish(secure_vector<byte>& buffer, size_t offset)
+   {
+   BOTAN_ASSERT(buffer.size() >= offset, "Offset is sane");
+   const size_t sz = buffer.size() - offset;
+   //byte* buf = &buffer[offset];
+
+   const size_t BS = cipher().block_size();
+
+   const size_t bytes_in_final_block = sz % BS;
+
+   const size_t pad_bytes = padding().pad_bytes(BS, bytes_in_final_block);
+
+   if((pad_bytes + bytes_in_final_block) % BS)
+      throw std::runtime_error("Did not pad to full block size in " + name());
+
+#if 0
+   const size_t pad_offset = buffer.size();
+   //buffer.resize(checked_add(buffer.size() + pad_bytes));
+   buffer.resize(buffer.size() + pad_bytes);
+
+   padder().pad(&buffer[pad_offset], BS, bytes_in_final_block);
+#else
+   std::vector<byte> pad(BS);
+   padding().pad(&pad[0], BS, bytes_in_final_block);
+
+   buffer.insert(buffer.end(), pad.begin(), pad.begin() + pad_bytes);
+#endif
+
+   update(buffer, offset);
+   }
+
+size_t ECB_Decryption::output_length(size_t input_length) const
+   {
+   return input_length;
+   }
+
+size_t ECB_Decryption::minimum_final_size() const
+   {
+   return cipher().block_size();
+   }
+
+void ECB_Decryption::update(secure_vector<byte>& buffer, size_t offset)
+   {
+   BOTAN_ASSERT(buffer.size() >= offset, "Offset is sane");
+   const size_t sz = buffer.size() - offset;
+   byte* buf = &buffer[offset];
+
+   const size_t BS = cipher().block_size();
+
+   BOTAN_ASSERT(sz % BS == 0, "Input is full blocks");
+   size_t blocks = sz / BS;
+
+   cipher().decrypt_n(&buf[0], &buf[0], blocks);
+   }
+
+void ECB_Decryption::finish(secure_vector<byte>& buffer, size_t offset)
+   {
+   BOTAN_ASSERT(buffer.size() >= offset, "Offset is sane");
+   const size_t sz = buffer.size() - offset;
+
+   const size_t BS = cipher().block_size();
+
+   if(sz == 0 || sz % BS)
+      throw Decoding_Error(name() + ": Ciphertext not a multiple of block size");
+
+   update(buffer, offset);
+
+   const size_t pad_bytes = BS - padding().unpad(&buffer[buffer.size()-BS], BS);
+   buffer.resize(buffer.size() - pad_bytes); // remove padding
+   }
+
+}
diff --git a/src/modes/ecb/ecb.h b/src/modes/ecb/ecb.h
new file mode 100644
index 000000000..459ac939a
--- /dev/null
+++ b/src/modes/ecb/ecb.h
@@ -0,0 +1,89 @@
+/*
+* ECB Mode
+* (C) 1999-2009,2013 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
+
+#ifndef BOTAN_MODE_ECB_H__
+#define BOTAN_MODE_ECB_H__
+
+#include <botan/transform.h>
+#include <botan/block_cipher.h>
+#include <botan/mode_pad.h>
+#include <memory>
+
+namespace Botan {
+
+/**
+* ECB Mode. Only handles full blocks, padding is handled higher up
+*/
+class ECB_Mode : public Transformation
+   {
+   public:
+      secure_vector<byte> start(const byte nonce[], size_t nonce_len) override;
+
+      std::string name() const override;
+
+      size_t update_granularity() const override;
+
+      Key_Length_Specification key_spec() const override;
+
+      size_t default_nonce_size() const override;
+
+      bool valid_nonce_length(size_t n) const override;
+
+      void clear();
+   protected:
+      ECB_Mode(BlockCipher* cipher, BlockCipherModePaddingMethod* padding);
+
+      const BlockCipher& cipher() const { return *m_cipher; }
+
+      const BlockCipherModePaddingMethod& padding() const { return *m_padding; }
+
+   private:
+      void key_schedule(const byte key[], size_t length) override;
+
+      std::unique_ptr<BlockCipher> m_cipher;
+      std::unique_ptr<BlockCipherModePaddingMethod> m_padding;
+   };
+
+/**
+* ECB Encryption
+*/
+class BOTAN_DLL ECB_Encryption : public ECB_Mode
+   {
+   public:
+      ECB_Encryption(BlockCipher* cipher, BlockCipherModePaddingMethod* padding) :
+         ECB_Mode(cipher, padding) {}
+
+      void update(secure_vector<byte>& blocks, size_t offset) override;
+
+      void finish(secure_vector<byte>& final_block, size_t offset) override;
+
+      size_t output_length(size_t input_length) const override;
+
+      size_t minimum_final_size() const override;
+   };
+
+/**
+* ECB Decryption
+*/
+class BOTAN_DLL ECB_Decryption : public ECB_Mode
+   {
+   public:
+      ECB_Decryption(BlockCipher* cipher, BlockCipherModePaddingMethod* padding) :
+         ECB_Mode(cipher, padding) {}
+
+      void update(secure_vector<byte>& blocks, size_t offset) override;
+
+      void finish(secure_vector<byte>& final_block, size_t offset) override;
+
+      size_t output_length(size_t input_length) const override;
+
+      size_t minimum_final_size() const override;
+   };
+
+}
+
+#endif
diff --git a/src/modes/ecb/info.txt b/src/modes/ecb/info.txt
new file mode 100644
index 000000000..03a5130b2
--- /dev/null
+++ b/src/modes/ecb/info.txt
@@ -0,0 +1,5 @@
+define MODE_ECB
+
+<requires>
+mode_pad
+</requires>