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

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

3 files changed, 37 insertions, 30 deletions

diff --git a/src/block/tea/info.txt b/src/block/tea/info.txt
index 6a0e76b15..85a19ee4c 100644
--- a/src/block/tea/info.txt
+++ b/src/block/tea/info.txt
@@ -1,10 +1,3 @@
 realname "TEA"
 
 define TEA
-
-load_on auto
-
-<add>
-tea.cpp
-tea.h
-</add>
diff --git a/src/block/tea/tea.cpp b/src/block/tea/tea.cpp
index 2b4212d9c..de30858da 100644
--- a/src/block/tea/tea.cpp
+++ b/src/block/tea/tea.cpp
@@ -13,37 +13,49 @@ namespace Botan {
 /*
 * TEA Encryption
 */
-void TEA::enc(const byte in[], byte out[]) const
+void TEA::encrypt_n(const byte in[], byte out[], u32bit blocks) const
    {
-   u32bit L = load_be<u32bit>(in, 0), R = load_be<u32bit>(in, 1);
-
-   u32bit S = 0;
-   for(u32bit j = 0; j != 32; ++j)
+   for(u32bit i = 0; i != blocks; ++i)
       {
-      S += 0x9E3779B9;
-      L += ((R << 4) + K[0]) ^ (R + S) ^ ((R >> 5) + K[1]);
-      R += ((L << 4) + K[2]) ^ (L + S) ^ ((L >> 5) + K[3]);
-      }
+      u32bit L = load_be<u32bit>(in, 0), R = load_be<u32bit>(in, 1);
+
+      u32bit S = 0;
+      for(u32bit j = 0; j != 32; ++j)
+         {
+         S += 0x9E3779B9;
+         L += ((R << 4) + K[0]) ^ (R + S) ^ ((R >> 5) + K[1]);
+         R += ((L << 4) + K[2]) ^ (L + S) ^ ((L >> 5) + K[3]);
+         }
 
-   store_be(out, L, R);
+      store_be(out, L, R);
+
+      in += BLOCK_SIZE;
+      out += BLOCK_SIZE;
+      }
    }
 
 /*
 * TEA Decryption
 */
-void TEA::dec(const byte in[], byte out[]) const
+void TEA::decrypt_n(const byte in[], byte out[], u32bit blocks) const
    {
-   u32bit L = load_be<u32bit>(in, 0), R = load_be<u32bit>(in, 1);
-
-   u32bit S = 0xC6EF3720;
-   for(u32bit j = 0; j != 32; ++j)
+   for(u32bit i = 0; i != blocks; ++i)
       {
-      R -= ((L << 4) + K[2]) ^ (L + S) ^ ((L >> 5) + K[3]);
-      L -= ((R << 4) + K[0]) ^ (R + S) ^ ((R >> 5) + K[1]);
-      S -= 0x9E3779B9;
-      }
+      u32bit L = load_be<u32bit>(in, 0), R = load_be<u32bit>(in, 1);
+
+      u32bit S = 0xC6EF3720;
+      for(u32bit j = 0; j != 32; ++j)
+         {
+         R -= ((L << 4) + K[2]) ^ (L + S) ^ ((L >> 5) + K[3]);
+         L -= ((R << 4) + K[0]) ^ (R + S) ^ ((R >> 5) + K[1]);
+         S -= 0x9E3779B9;
+         }
 
-   store_be(out, L, R);
+      store_be(out, L, R);
+
+      in += BLOCK_SIZE;
+      out += BLOCK_SIZE;
+      }
    }
 
 /*
diff --git a/src/block/tea/tea.h b/src/block/tea/tea.h
index 8ddf3e330..c19f272a6 100644
--- a/src/block/tea/tea.h
+++ b/src/block/tea/tea.h
@@ -18,13 +18,15 @@ namespace Botan {
 class BOTAN_DLL TEA : public BlockCipher
    {
    public:
-      void clear() throw() { K.clear(); }
+      void encrypt_n(const byte in[], byte out[], u32bit blocks) const;
+      void decrypt_n(const byte in[], byte out[], u32bit blocks) const;
+
+      void clear() { K.clear(); }
       std::string name() const { return "TEA"; }
       BlockCipher* clone() const { return new TEA; }
+
       TEA() : BlockCipher(8, 16) {}
    private:
-      void enc(const byte[], byte[]) const;
-      void dec(const byte[], byte[]) const;
       void key_schedule(const byte[], u32bit);
       SecureBuffer<u32bit, 4> K;
    };