1 files changed, 59 insertions, 47 deletions
diff --git a/src/block/lubyrack/lubyrack.cpp b/src/block/lubyrack/lubyrack.cpp
index a9d2b1db2..2003d2a89 100644
--- a/src/block/lubyrack/lubyrack.cpp
+++ b/src/block/lubyrack/lubyrack.cpp
@@ -13,59 +13,71 @@ namespace Botan {
 /*
 * Luby-Rackoff Encryption
 */
-void LubyRackoff::enc(const byte in[], byte out[]) const
+void LubyRackoff::encrypt_n(const byte in[], byte out[], u32bit blocks) const
    {
-   const u32bit len = hash->OUTPUT_LENGTH;
-
-   SecureVector<byte> buffer(len);
-   hash->update(K1);
-   hash->update(in, len);
-   hash->final(buffer);
-   xor_buf(out + len, in + len, buffer, len);
-
-   hash->update(K2);
-   hash->update(out + len, len);
-   hash->final(buffer);
-   xor_buf(out, in, buffer, len);
-
-   hash->update(K1);
-   hash->update(out, len);
-   hash->final(buffer);
-   xor_buf(out + len, buffer, len);
-
-   hash->update(K2);
-   hash->update(out + len, len);
-   hash->final(buffer);
-   xor_buf(out, buffer, len);
+   for(u32bit i = 0; i != blocks; ++i)
+      {
+      const u32bit len = hash->OUTPUT_LENGTH;
+
+      SecureVector<byte> buffer(len);
+      hash->update(K1);
+      hash->update(in, len);
+      hash->final(buffer);
+      xor_buf(out + len, in + len, buffer, len);
+
+      hash->update(K2);
+      hash->update(out + len, len);
+      hash->final(buffer);
+      xor_buf(out, in, buffer, len);
+
+      hash->update(K1);
+      hash->update(out, len);
+      hash->final(buffer);
+      xor_buf(out + len, buffer, len);
+
+      hash->update(K2);
+      hash->update(out + len, len);
+      hash->final(buffer);
+      xor_buf(out, buffer, len);
+
+      in += BLOCK_SIZE;
+      out += BLOCK_SIZE;
+      }
    }
 
 /*
 * Luby-Rackoff Decryption
 */
-void LubyRackoff::dec(const byte in[], byte out[]) const
+void LubyRackoff::decrypt_n(const byte in[], byte out[], u32bit blocks) const
    {
-   const u32bit len = hash->OUTPUT_LENGTH;
-
-   SecureVector<byte> buffer(len);
-   hash->update(K2);
-   hash->update(in + len, len);
-   hash->final(buffer);
-   xor_buf(out, in, buffer, len);
-
-   hash->update(K1);
-   hash->update(out, len);
-   hash->final(buffer);
-   xor_buf(out + len, in + len, buffer, len);
-
-   hash->update(K2);
-   hash->update(out + len, len);
-   hash->final(buffer);
-   xor_buf(out, buffer, len);
-
-   hash->update(K1);
-   hash->update(out, len);
-   hash->final(buffer);
-   xor_buf(out + len, buffer, len);
+   for(u32bit i = 0; i != blocks; ++i)
+      {
+      const u32bit len = hash->OUTPUT_LENGTH;
+
+      SecureVector<byte> buffer(len);
+      hash->update(K2);
+      hash->update(in + len, len);
+      hash->final(buffer);
+      xor_buf(out, in, buffer, len);
+
+      hash->update(K1);
+      hash->update(out, len);
+      hash->final(buffer);
+      xor_buf(out + len, in + len, buffer, len);
+
+      hash->update(K2);
+      hash->update(out + len, len);
+      hash->final(buffer);
+      xor_buf(out, buffer, len);
+
+      hash->update(K1);
+      hash->update(out, len);
+      hash->final(buffer);
+      xor_buf(out + len, buffer, len);
+
+      in += BLOCK_SIZE;
+      out += BLOCK_SIZE;
+      }
    }
 
 /*
@@ -80,7 +92,7 @@ void LubyRackoff::key_schedule(const byte key[], u32bit length)
 /*
 * Clear memory of sensitive data
 */
-void LubyRackoff::clear() throw()
+void LubyRackoff::clear()
    {
    K1.clear();
    K2.clear();