3 files changed, 37 insertions, 31 deletions

diff --git a/src/block/lion/info.txt b/src/block/lion/info.txt
index 81ef58511..64f2989b1 100644
--- a/src/block/lion/info.txt
+++ b/src/block/lion/info.txt
@@ -2,13 +2,6 @@ realname "Lion"
 
 define LION
 
-load_on auto
-
-<add>
-lion.cpp
-lion.h
-</add>
-
 <requires>
 hash
 stream
diff --git a/src/block/lion/lion.cpp b/src/block/lion/lion.cpp
index c7cdf6d13..e71091258 100644
--- a/src/block/lion/lion.cpp
+++ b/src/block/lion/lion.cpp
@@ -14,41 +14,53 @@ namespace Botan {
 /*
 * Lion Encryption
 */
-void Lion::enc(const byte in[], byte out[]) const
+void Lion::encrypt_n(const byte in[], byte out[], u32bit blocks) const
    {
    SecureVector<byte> buffer(LEFT_SIZE);
 
-   xor_buf(buffer, in, key1, LEFT_SIZE);
-   cipher->set_key(buffer, LEFT_SIZE);
-   cipher->encrypt(in + LEFT_SIZE, out + LEFT_SIZE, RIGHT_SIZE);
+   for(u32bit i = 0; i != blocks; ++i)
+      {
+      xor_buf(buffer, in, key1, LEFT_SIZE);
+      cipher->set_key(buffer, LEFT_SIZE);
+      cipher->cipher(in + LEFT_SIZE, out + LEFT_SIZE, RIGHT_SIZE);
 
-   hash->update(out + LEFT_SIZE, RIGHT_SIZE);
-   hash->final(buffer);
-   xor_buf(out, in, buffer, LEFT_SIZE);
+      hash->update(out + LEFT_SIZE, RIGHT_SIZE);
+      hash->final(buffer);
+      xor_buf(out, in, buffer, LEFT_SIZE);
 
-   xor_buf(buffer, out, key2, LEFT_SIZE);
-   cipher->set_key(buffer, LEFT_SIZE);
-   cipher->encrypt(out + LEFT_SIZE, RIGHT_SIZE);
+      xor_buf(buffer, out, key2, LEFT_SIZE);
+      cipher->set_key(buffer, LEFT_SIZE);
+      cipher->cipher1(out + LEFT_SIZE, RIGHT_SIZE);
+
+      in += BLOCK_SIZE;
+      out += BLOCK_SIZE;
+      }
    }
 
 /*
 * Lion Decryption
 */
-void Lion::dec(const byte in[], byte out[]) const
+void Lion::decrypt_n(const byte in[], byte out[], u32bit blocks) const
    {
    SecureVector<byte> buffer(LEFT_SIZE);
 
-   xor_buf(buffer, in, key2, LEFT_SIZE);
-   cipher->set_key(buffer, LEFT_SIZE);
-   cipher->encrypt(in + LEFT_SIZE, out + LEFT_SIZE, RIGHT_SIZE);
+   for(u32bit i = 0; i != blocks; ++i)
+      {
+      xor_buf(buffer, in, key2, LEFT_SIZE);
+      cipher->set_key(buffer, LEFT_SIZE);
+      cipher->cipher(in + LEFT_SIZE, out + LEFT_SIZE, RIGHT_SIZE);
+
+      hash->update(out + LEFT_SIZE, RIGHT_SIZE);
+      hash->final(buffer);
+      xor_buf(out, in, buffer, LEFT_SIZE);
 
-   hash->update(out + LEFT_SIZE, RIGHT_SIZE);
-   hash->final(buffer);
-   xor_buf(out, in, buffer, LEFT_SIZE);
+      xor_buf(buffer, out, key1, LEFT_SIZE);
+      cipher->set_key(buffer, LEFT_SIZE);
+      cipher->cipher1(out + LEFT_SIZE, RIGHT_SIZE);
 
-   xor_buf(buffer, out, key1, LEFT_SIZE);
-   cipher->set_key(buffer, LEFT_SIZE);
-   cipher->encrypt(out + LEFT_SIZE, RIGHT_SIZE);
+      in += BLOCK_SIZE;
+      out += BLOCK_SIZE;
+      }
    }
 
 /*
@@ -83,7 +95,7 @@ BlockCipher* Lion::clone() const
 /*
 * Clear memory of sensitive data
 */
-void Lion::clear() throw()
+void Lion::clear()
    {
    hash->clear();
    cipher->clear();
diff --git a/src/block/lion/lion.h b/src/block/lion/lion.h
index 5bc4e72c0..f24acdb72 100644
--- a/src/block/lion/lion.h
+++ b/src/block/lion/lion.h
@@ -20,15 +20,16 @@ namespace Botan {
 class BOTAN_DLL Lion : 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;
       BlockCipher* clone() const;
 
       Lion(HashFunction*, StreamCipher*, u32bit);
       ~Lion() { delete hash; delete cipher; }
    private:
-      void enc(const byte[], byte[]) const;
-      void dec(const byte[], byte[]) const;
       void key_schedule(const byte[], u32bit);
 
       const u32bit LEFT_SIZE, RIGHT_SIZE;