3 files changed, 48 insertions, 44 deletions

diff --git a/src/block/blowfish/blowfish.cpp b/src/block/blowfish/blowfish.cpp
index b0599d6c5..d0b182a84 100644
--- a/src/block/blowfish/blowfish.cpp
+++ b/src/block/blowfish/blowfish.cpp
@@ -1,6 +1,6 @@
 /*
 * Blowfish
-* (C) 1999-2007 Jack Lloyd
+* (C) 1999-2009 Jack Lloyd
 *
 * Distributed under the terms of the Botan license
 */
@@ -13,59 +13,71 @@ namespace Botan {
 /*
 * Blowfish Encryption
 */
-void Blowfish::enc(const byte in[], byte out[]) const
+void Blowfish::encrypt_n(const byte in[], byte out[], u32bit blocks) const
    {
    const u32bit* S1 = S + 0;
    const u32bit* S2 = S + 256;
    const u32bit* S3 = S + 512;
    const u32bit* S4 = S + 768;
 
-   u32bit L = load_be<u32bit>(in, 0);
-   u32bit R = load_be<u32bit>(in, 1);
-
-   for(u32bit j = 0; j != 16; j += 2)
+   for(u32bit i = 0; i != blocks; ++i)
       {
-      L ^= P[j];
-      R ^= ((S1[get_byte(0, L)]  + S2[get_byte(1, L)]) ^
-             S3[get_byte(2, L)]) + S4[get_byte(3, L)];
+      u32bit L = load_be<u32bit>(in, 0);
+      u32bit R = load_be<u32bit>(in, 1);
 
-      R ^= P[j+1];
-      L ^= ((S1[get_byte(0, R)]  + S2[get_byte(1, R)]) ^
-             S3[get_byte(2, R)]) + S4[get_byte(3, R)];
-      }
+      for(u32bit j = 0; j != 16; j += 2)
+         {
+         L ^= P[j];
+         R ^= ((S1[get_byte(0, L)]  + S2[get_byte(1, L)]) ^
+                S3[get_byte(2, L)]) + S4[get_byte(3, L)];
 
-   L ^= P[16]; R ^= P[17];
+         R ^= P[j+1];
+         L ^= ((S1[get_byte(0, R)]  + S2[get_byte(1, R)]) ^
+                S3[get_byte(2, R)]) + S4[get_byte(3, R)];
+         }
+
+      L ^= P[16]; R ^= P[17];
 
-   store_be(out, R, L);
+      store_be(out, R, L);
+
+      in += BLOCK_SIZE;
+      out += BLOCK_SIZE;
+      }
    }
 
 /*
 * Blowfish Decryption
 */
-void Blowfish::dec(const byte in[], byte out[]) const
+void Blowfish::decrypt_n(const byte in[], byte out[], u32bit blocks) const
    {
    const u32bit* S1 = S + 0;
    const u32bit* S2 = S + 256;
    const u32bit* S3 = S + 512;
    const u32bit* S4 = S + 768;
 
-   u32bit L = load_be<u32bit>(in, 0);
-   u32bit R = load_be<u32bit>(in, 1);
-
-   for(u32bit j = 17; j != 1; j -= 2)
+   for(u32bit i = 0; i != blocks; ++i)
       {
-      L ^= P[j];
-      R ^= ((S1[get_byte(0, L)]  + S2[get_byte(1, L)]) ^
-             S3[get_byte(2, L)]) + S4[get_byte(3, L)];
+      u32bit L = load_be<u32bit>(in, 0);
+      u32bit R = load_be<u32bit>(in, 1);
 
-      R ^= P[j-1];
-      L ^= ((S1[get_byte(0, R)]  + S2[get_byte(1, R)]) ^
-             S3[get_byte(2, R)]) + S4[get_byte(3, R)];
-      }
+      for(u32bit j = 17; j != 1; j -= 2)
+         {
+         L ^= P[j];
+         R ^= ((S1[get_byte(0, L)]  + S2[get_byte(1, L)]) ^
+                S3[get_byte(2, L)]) + S4[get_byte(3, L)];
 
-   L ^= P[1]; R ^= P[0];
+         R ^= P[j-1];
+         L ^= ((S1[get_byte(0, R)]  + S2[get_byte(1, R)]) ^
+                S3[get_byte(2, R)]) + S4[get_byte(3, R)];
+         }
+
+      L ^= P[1]; R ^= P[0];
 
-   store_be(out, R, L);
+      store_be(out, R, L);
+
+      in += BLOCK_SIZE;
+      out += BLOCK_SIZE;
+      }
    }
 
 /*
@@ -116,7 +128,7 @@ void Blowfish::generate_sbox(u32bit Box[], u32bit size,
 /*
 * Clear memory of sensitive data
 */
-void Blowfish::clear() throw()
+void Blowfish::clear()
    {
    P.copy(P_INIT, 18);
    S.copy(S_INIT, 1024);
diff --git a/src/block/blowfish/blowfish.h b/src/block/blowfish/blowfish.h
index f0f26418d..5419308ca 100644
--- a/src/block/blowfish/blowfish.h
+++ b/src/block/blowfish/blowfish.h
@@ -1,6 +1,6 @@
 /*
 * Blowfish
-* (C) 1999-2008 Jack Lloyd
+* (C) 1999-2009 Jack Lloyd
 *
 * Distributed under the terms of the Botan license
 */
@@ -18,13 +18,15 @@ namespace Botan {
 class BOTAN_DLL Blowfish : public BlockCipher
    {
    public:
-      void clear() throw();
+      void encrypt_n(const byte in[], byte out[], u32bit blocks) const;
+      void decrypt_n(const byte in[], byte out[], u32bit blocks) const;
+
+      void clear();
       std::string name() const { return "Blowfish"; }
       BlockCipher* clone() const { return new Blowfish; }
+
       Blowfish() : BlockCipher(8, 1, 56) {}
    private:
-      void enc(const byte[], byte[]) const;
-      void dec(const byte[], byte[]) const;
       void key_schedule(const byte[], u32bit);
       void generate_sbox(u32bit[], u32bit, u32bit&, u32bit&) const;
 
diff --git a/src/block/blowfish/info.txt b/src/block/blowfish/info.txt
index 0a9d2adc2..c935fb3ab 100644
--- a/src/block/blowfish/info.txt
+++ b/src/block/blowfish/info.txt
@@ -1,11 +1 @@
-realname "Blowfish"
-
 define BLOWFISH
-
-load_on auto
-
-<add>
-blfs_tab.cpp
-blowfish.cpp
-blowfish.h
-</add>