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

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

3 files changed, 47 insertions, 40 deletions

diff --git a/src/block/rc5/info.txt b/src/block/rc5/info.txt
index 4a150c3b0..2032b406f 100644
--- a/src/block/rc5/info.txt
+++ b/src/block/rc5/info.txt
@@ -1,10 +1,3 @@
 realname "RC5"
 
 define RC5
-
-load_on auto
-
-<add>
-rc5.cpp
-rc5.h
-</add>
diff --git a/src/block/rc5/rc5.cpp b/src/block/rc5/rc5.cpp
index 5d83d5a4e..4bfa27ea0 100644
--- a/src/block/rc5/rc5.cpp
+++ b/src/block/rc5/rc5.cpp
@@ -16,47 +16,59 @@ namespace Botan {
 /*
 * RC5 Encryption
 */
-void RC5::enc(const byte in[], byte out[]) const
+void RC5::encrypt_n(const byte in[], byte out[], u32bit blocks) const
    {
-   u32bit A = load_le<u32bit>(in, 0), B = load_le<u32bit>(in, 1);
-
-   A += S[0]; B += S[1];
-   for(u32bit j = 0; j != ROUNDS; j += 4)
+   for(u32bit i = 0; i != blocks; ++i)
       {
-      A = rotate_left(A ^ B, B % 32) + S[2*j+2];
-      B = rotate_left(B ^ A, A % 32) + S[2*j+3];
-      A = rotate_left(A ^ B, B % 32) + S[2*j+4];
-      B = rotate_left(B ^ A, A % 32) + S[2*j+5];
-      A = rotate_left(A ^ B, B % 32) + S[2*j+6];
-      B = rotate_left(B ^ A, A % 32) + S[2*j+7];
-      A = rotate_left(A ^ B, B % 32) + S[2*j+8];
-      B = rotate_left(B ^ A, A % 32) + S[2*j+9];
-      }
+      u32bit A = load_le<u32bit>(in, 0), B = load_le<u32bit>(in, 1);
+
+      A += S[0]; B += S[1];
+      for(u32bit j = 0; j != ROUNDS; j += 4)
+         {
+         A = rotate_left(A ^ B, B % 32) + S[2*j+2];
+         B = rotate_left(B ^ A, A % 32) + S[2*j+3];
+         A = rotate_left(A ^ B, B % 32) + S[2*j+4];
+         B = rotate_left(B ^ A, A % 32) + S[2*j+5];
+         A = rotate_left(A ^ B, B % 32) + S[2*j+6];
+         B = rotate_left(B ^ A, A % 32) + S[2*j+7];
+         A = rotate_left(A ^ B, B % 32) + S[2*j+8];
+         B = rotate_left(B ^ A, A % 32) + S[2*j+9];
+         }
 
-   store_le(out, A, B);
+      store_le(out, A, B);
+
+      in += BLOCK_SIZE;
+      out += BLOCK_SIZE;
+      }
    }
 
 /*
 * RC5 Decryption
 */
-void RC5::dec(const byte in[], byte out[]) const
+void RC5::decrypt_n(const byte in[], byte out[], u32bit blocks) const
    {
-   u32bit A = load_le<u32bit>(in, 0), B = load_le<u32bit>(in, 1);
-
-   for(u32bit j = ROUNDS; j != 0; j -= 4)
+   for(u32bit i = 0; i != blocks; ++i)
       {
-      B = rotate_right(B - S[2*j+1], A % 32) ^ A;
-      A = rotate_right(A - S[2*j  ], B % 32) ^ B;
-      B = rotate_right(B - S[2*j-1], A % 32) ^ A;
-      A = rotate_right(A - S[2*j-2], B % 32) ^ B;
-      B = rotate_right(B - S[2*j-3], A % 32) ^ A;
-      A = rotate_right(A - S[2*j-4], B % 32) ^ B;
-      B = rotate_right(B - S[2*j-5], A % 32) ^ A;
-      A = rotate_right(A - S[2*j-6], B % 32) ^ B;
-      }
-   B -= S[1]; A -= S[0];
+      u32bit A = load_le<u32bit>(in, 0), B = load_le<u32bit>(in, 1);
+
+      for(u32bit j = ROUNDS; j != 0; j -= 4)
+         {
+         B = rotate_right(B - S[2*j+1], A % 32) ^ A;
+         A = rotate_right(A - S[2*j  ], B % 32) ^ B;
+         B = rotate_right(B - S[2*j-1], A % 32) ^ A;
+         A = rotate_right(A - S[2*j-2], B % 32) ^ B;
+         B = rotate_right(B - S[2*j-3], A % 32) ^ A;
+         A = rotate_right(A - S[2*j-4], B % 32) ^ B;
+         B = rotate_right(B - S[2*j-5], A % 32) ^ A;
+         A = rotate_right(A - S[2*j-6], B % 32) ^ B;
+         }
+      B -= S[1]; A -= S[0];
 
-   store_le(out, A, B);
+      store_le(out, A, B);
+
+      in += BLOCK_SIZE;
+      out += BLOCK_SIZE;
+      }
    }
 
 /*
diff --git a/src/block/rc5/rc5.h b/src/block/rc5/rc5.h
index 083224720..82931c1d2 100644
--- a/src/block/rc5/rc5.h
+++ b/src/block/rc5/rc5.h
@@ -18,13 +18,15 @@ namespace Botan {
 class BOTAN_DLL RC5 : public BlockCipher
    {
    public:
-      void clear() throw() { S.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() { S.clear(); }
       std::string name() const;
       BlockCipher* clone() const { return new RC5(ROUNDS); }
+
       RC5(u32bit);
    private:
-      void enc(const byte[], byte[]) const;
-      void dec(const byte[], byte[]) const;
       void key_schedule(const byte[], u32bit);
       SecureVector<u32bit> S;
       const u32bit ROUNDS;