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

            to branch 'net.randombit.botan' (head 77ba4ea5a4be36d6d029bcc852b2271edff0d679)

3 files changed, 94 insertions, 28 deletions

diff --git a/src/block/xtea/info.txt b/src/block/xtea/info.txt
index 0120a3bce..d9d37607c 100644
--- a/src/block/xtea/info.txt
+++ b/src/block/xtea/info.txt
@@ -1,10 +1 @@
-realname "XTEA"
-
 define XTEA
-
-load_on auto
-
-<add>
-xtea.cpp
-xtea.h
-</add>
diff --git a/src/block/xtea/xtea.cpp b/src/block/xtea/xtea.cpp
index 5047f6594..fc14c0a57 100644
--- a/src/block/xtea/xtea.cpp
+++ b/src/block/xtea/xtea.cpp
@@ -7,40 +7,113 @@
 
 #include <botan/xtea.h>
 #include <botan/loadstor.h>
-#include <botan/parsing.h>
 
 namespace Botan {
 
+namespace {
+
+void xtea_encrypt_4(const byte in[32], byte out[32], const u32bit EK[64])
+   {
+   u32bit L0, R0, L1, R1, L2, R2, L3, R3;
+   load_be(in, L0, R0, L1, R1, L2, R2, L3, R3);
+
+   for(u32bit i = 0; i != 32; ++i)
+      {
+      L0 += (((R0 << 4) ^ (R0 >> 5)) + R0) ^ EK[2*i];
+      L1 += (((R1 << 4) ^ (R1 >> 5)) + R1) ^ EK[2*i];
+      L2 += (((R2 << 4) ^ (R2 >> 5)) + R2) ^ EK[2*i];
+      L3 += (((R3 << 4) ^ (R3 >> 5)) + R3) ^ EK[2*i];
+
+      R0 += (((L0 << 4) ^ (L0 >> 5)) + L0) ^ EK[2*i+1];
+      R1 += (((L1 << 4) ^ (L1 >> 5)) + L1) ^ EK[2*i+1];
+      R2 += (((L2 << 4) ^ (L2 >> 5)) + L2) ^ EK[2*i+1];
+      R3 += (((L3 << 4) ^ (L3 >> 5)) + L3) ^ EK[2*i+1];
+      }
+
+   store_be(out, L0, R0, L1, R1, L2, R2, L3, R3);
+   }
+
+void xtea_decrypt_4(const byte in[32], byte out[32], const u32bit EK[64])
+   {
+   u32bit L0, R0, L1, R1, L2, R2, L3, R3;
+   load_be(in, L0, R0, L1, R1, L2, R2, L3, R3);
+
+   for(u32bit i = 0; i != 32; ++i)
+      {
+      R0 -= (((L0 << 4) ^ (L0 >> 5)) + L0) ^ EK[63 - 2*i];
+      R1 -= (((L1 << 4) ^ (L1 >> 5)) + L1) ^ EK[63 - 2*i];
+      R2 -= (((L2 << 4) ^ (L2 >> 5)) + L2) ^ EK[63 - 2*i];
+      R3 -= (((L3 << 4) ^ (L3 >> 5)) + L3) ^ EK[63 - 2*i];
+
+      L0 -= (((R0 << 4) ^ (R0 >> 5)) + R0) ^ EK[62 - 2*i];
+      L1 -= (((R1 << 4) ^ (R1 >> 5)) + R1) ^ EK[62 - 2*i];
+      L2 -= (((R2 << 4) ^ (R2 >> 5)) + R2) ^ EK[62 - 2*i];
+      L3 -= (((R3 << 4) ^ (R3 >> 5)) + R3) ^ EK[62 - 2*i];
+      }
+
+   store_be(out, L0, R0, L1, R1, L2, R2, L3, R3);
+   }
+
+}
+
 /*
 * XTEA Encryption
 */
-void XTEA::enc(const byte in[], byte out[]) const
+void XTEA::encrypt_n(const byte in[], byte out[], u32bit blocks) const
    {
-   u32bit L = load_be<u32bit>(in, 0), R = load_be<u32bit>(in, 1);
-
-   for(u32bit j = 0; j != 32; ++j)
+   while(blocks >= 4)
       {
-      L += (((R << 4) ^ (R >> 5)) + R) ^ EK[2*j];
-      R += (((L << 4) ^ (L >> 5)) + L) ^ EK[2*j+1];
+      xtea_encrypt_4(in, out, this->EK);
+      in += 4 * BLOCK_SIZE;
+      out += 4 * BLOCK_SIZE;
+      blocks -= 4;
       }
 
-   store_be(out, L, R);
+   for(u32bit i = 0; i != blocks; ++i)
+      {
+      u32bit L = load_be<u32bit>(in, 0), R = load_be<u32bit>(in, 1);
+
+      for(u32bit j = 0; j != 32; ++j)
+         {
+         L += (((R << 4) ^ (R >> 5)) + R) ^ EK[2*j];
+         R += (((L << 4) ^ (L >> 5)) + L) ^ EK[2*j+1];
+         }
+
+      store_be(out, L, R);
+
+      in += BLOCK_SIZE;
+      out += BLOCK_SIZE;
+      }
    }
 
 /*
 * XTEA Decryption
 */
-void XTEA::dec(const byte in[], byte out[]) const
+void XTEA::decrypt_n(const byte in[], byte out[], u32bit blocks) const
    {
-   u32bit L = load_be<u32bit>(in, 0), R = load_be<u32bit>(in, 1);
-
-   for(u32bit j = 0; j != 32; ++j)
+   while(blocks >= 4)
       {
-      R -= (((L << 4) ^ (L >> 5)) + L) ^ EK[63 - 2*j];
-      L -= (((R << 4) ^ (R >> 5)) + R) ^ EK[62 - 2*j];
+      xtea_decrypt_4(in, out, this->EK);
+      in += 4 * BLOCK_SIZE;
+      out += 4 * BLOCK_SIZE;
+      blocks -= 4;
       }
 
-   store_be(out, L, R);
+   for(u32bit i = 0; i != blocks; ++i)
+      {
+      u32bit L = load_be<u32bit>(in, 0), R = load_be<u32bit>(in, 1);
+
+      for(u32bit j = 0; j != 32; ++j)
+         {
+         R -= (((L << 4) ^ (L >> 5)) + L) ^ EK[63 - 2*j];
+         L -= (((R << 4) ^ (R >> 5)) + R) ^ EK[62 - 2*j];
+         }
+
+      store_be(out, L, R);
+
+      in += BLOCK_SIZE;
+      out += BLOCK_SIZE;
+      }
    }
 
 /*
diff --git a/src/block/xtea/xtea.h b/src/block/xtea/xtea.h
index d9c6066cb..9982d0712 100644
--- a/src/block/xtea/xtea.h
+++ b/src/block/xtea/xtea.h
@@ -18,13 +18,15 @@ namespace Botan {
 class BOTAN_DLL XTEA : public BlockCipher
    {
    public:
-      void clear() throw() { EK.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() { EK.clear(); }
       std::string name() const { return "XTEA"; }
       BlockCipher* clone() const { return new XTEA; }
+
       XTEA() : BlockCipher(8, 16) {}
-   private:
-      void enc(const byte[], byte[]) const;
-      void dec(const byte[], byte[]) const;
+   protected:
       void key_schedule(const byte[], u32bit);
       SecureBuffer<u32bit, 64> EK;
    };