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

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

3 files changed, 69 insertions, 63 deletions

diff --git a/src/block/seed/info.txt b/src/block/seed/info.txt
index d04979335..c66e0c2cd 100644
--- a/src/block/seed/info.txt
+++ b/src/block/seed/info.txt
@@ -1,11 +1,3 @@
 realname "SEED"
 
 define SEED
-
-load_on auto
-
-<add>
-seed.cpp
-seed.h
-seed_tab.cpp
-</add>
diff --git a/src/block/seed/seed.cpp b/src/block/seed/seed.cpp
index b06a7cd77..378be16e4 100644
--- a/src/block/seed/seed.cpp
+++ b/src/block/seed/seed.cpp
@@ -22,69 +22,81 @@ u32bit SEED::G_FUNC::operator()(u32bit X) const
 /*
 * SEED Encryption
 */
-void SEED::enc(const byte in[], byte out[]) const
+void SEED::encrypt_n(const byte in[], byte out[], u32bit blocks) const
    {
-   u32bit B0 = load_be<u32bit>(in, 0);
-   u32bit B1 = load_be<u32bit>(in, 1);
-   u32bit B2 = load_be<u32bit>(in, 2);
-   u32bit B3 = load_be<u32bit>(in, 3);
-
-   G_FUNC G;
-
-   for(u32bit j = 0; j != 16; j += 2)
+   for(u32bit i = 0; i != blocks; ++i)
       {
-      u32bit T0, T1;
-
-      T0 = B2 ^ K[2*j];
-      T1 = G(B2 ^ B3 ^ K[2*j+1]);
-      T0 = G(T1 + T0);
-      T1 = G(T1 + T0);
-      B1 ^= T1;
-      B0 ^= T0 + T1;
-
-      T0 = B0 ^ K[2*j+2];
-      T1 = G(B0 ^ B1 ^ K[2*j+3]);
-      T0 = G(T1 + T0);
-      T1 = G(T1 + T0);
-      B3 ^= T1;
-      B2 ^= T0 + T1;
+      u32bit B0 = load_be<u32bit>(in, 0);
+      u32bit B1 = load_be<u32bit>(in, 1);
+      u32bit B2 = load_be<u32bit>(in, 2);
+      u32bit B3 = load_be<u32bit>(in, 3);
+
+      G_FUNC G;
+
+      for(u32bit j = 0; j != 16; j += 2)
+         {
+         u32bit T0, T1;
+
+         T0 = B2 ^ K[2*j];
+         T1 = G(B2 ^ B3 ^ K[2*j+1]);
+         T0 = G(T1 + T0);
+         T1 = G(T1 + T0);
+         B1 ^= T1;
+         B0 ^= T0 + T1;
+
+         T0 = B0 ^ K[2*j+2];
+         T1 = G(B0 ^ B1 ^ K[2*j+3]);
+         T0 = G(T1 + T0);
+         T1 = G(T1 + T0);
+         B3 ^= T1;
+         B2 ^= T0 + T1;
+         }
+
+      store_be(out, B2, B3, B0, B1);
+
+      in += BLOCK_SIZE;
+      out += BLOCK_SIZE;
       }
-
-   store_be(out, B2, B3, B0, B1);
    }
 
 /*
 * SEED Decryption
 */
-void SEED::dec(const byte in[], byte out[]) const
+void SEED::decrypt_n(const byte in[], byte out[], u32bit blocks) const
    {
-   u32bit B0 = load_be<u32bit>(in, 0);
-   u32bit B1 = load_be<u32bit>(in, 1);
-   u32bit B2 = load_be<u32bit>(in, 2);
-   u32bit B3 = load_be<u32bit>(in, 3);
-
-   G_FUNC G;
-
-   for(u32bit j = 0; j != 16; j += 2)
+   for(u32bit i = 0; i != blocks; ++i)
       {
-      u32bit T0, T1;
-
-      T0 = B2 ^ K[30-2*j];
-      T1 = G(B2 ^ B3 ^ K[31-2*j]);
-      T0 = G(T1 + T0);
-      T1 = G(T1 + T0);
-      B1 ^= T1;
-      B0 ^= T0 + T1;
-
-      T0 = B0 ^ K[28-2*j];
-      T1 = G(B0 ^ B1 ^ K[29-2*j]);
-      T0 = G(T1 + T0);
-      T1 = G(T1 + T0);
-      B3 ^= T1;
-      B2 ^= T0 + T1;
+      u32bit B0 = load_be<u32bit>(in, 0);
+      u32bit B1 = load_be<u32bit>(in, 1);
+      u32bit B2 = load_be<u32bit>(in, 2);
+      u32bit B3 = load_be<u32bit>(in, 3);
+
+      G_FUNC G;
+
+      for(u32bit j = 0; j != 16; j += 2)
+         {
+         u32bit T0, T1;
+
+         T0 = B2 ^ K[30-2*j];
+         T1 = G(B2 ^ B3 ^ K[31-2*j]);
+         T0 = G(T1 + T0);
+         T1 = G(T1 + T0);
+         B1 ^= T1;
+         B0 ^= T0 + T1;
+
+         T0 = B0 ^ K[28-2*j];
+         T1 = G(B0 ^ B1 ^ K[29-2*j]);
+         T0 = G(T1 + T0);
+         T1 = G(T1 + T0);
+         B3 ^= T1;
+         B2 ^= T0 + T1;
+         }
+
+      store_be(out, B2, B3, B0, B1);
+
+      in += BLOCK_SIZE;
+      out += BLOCK_SIZE;
       }
-
-   store_be(out, B2, B3, B0, B1);
    }
 
 /*
diff --git a/src/block/seed/seed.h b/src/block/seed/seed.h
index 54c25d580..5a4b44057 100644
--- a/src/block/seed/seed.h
+++ b/src/block/seed/seed.h
@@ -18,13 +18,15 @@ namespace Botan {
 class BOTAN_DLL SEED : 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 "SEED"; }
       BlockCipher* clone() const { return new SEED; }
+
       SEED() : BlockCipher(16, 16) {}
    private:
-      void enc(const byte[], byte[]) const;
-      void dec(const byte[], byte[]) const;
       void key_schedule(const byte[], u32bit);
 
       class G_FUNC