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

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

1 files changed, 14 insertions, 4 deletions

diff --git a/src/block/serpent_ia32/serp_ia32.cpp b/src/block/serpent_ia32/serp_ia32.cpp
index 37dd4e637..997bec2fc 100644
--- a/src/block/serpent_ia32/serp_ia32.cpp
+++ b/src/block/serpent_ia32/serp_ia32.cpp
@@ -21,17 +21,27 @@ void botan_serpent_ia32_key_schedule(u32bit[140]);
 /*
 * Serpent Encryption
 */
-void Serpent_IA32::enc(const byte in[], byte out[]) const
+void Serpent_IA32::encrypt_n(const byte in[], byte out[], u32bit blocks) const
    {
-   botan_serpent_ia32_encrypt(in, out, round_key);
+   for(u32bit i = 0; i != blocks; ++i)
+      {
+      botan_serpent_ia32_encrypt(in, out, round_key);
+      in += BLOCK_SIZE;
+      out += BLOCK_SIZE;
+      }
    }
 
 /*
 * Serpent Decryption
 */
-void Serpent_IA32::dec(const byte in[], byte out[]) const
+void Serpent_IA32::decrypt_n(const byte in[], byte out[], u32bit blocks) const
    {
-   botan_serpent_ia32_decrypt(in, out, round_key);
+   for(u32bit i = 0; i != blocks; ++i)
+      {
+      botan_serpent_ia32_decrypt(in, out, round_key);
+      in += BLOCK_SIZE;
+      out += BLOCK_SIZE;
+      }
    }
 
 /*