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

            to branch 'net.randombit.botan' (head 77ba4ea5a4be36d6d029bcc852b2271edff0d679)

5 files changed, 118 insertions, 89 deletions

diff --git a/src/block/des/des.cpp b/src/block/des/des.cpp
index 37520e0fc..05287304f 100644
--- a/src/block/des/des.cpp
+++ b/src/block/des/des.cpp
@@ -139,51 +139,62 @@ void des_decrypt(u32bit& L, u32bit& R,
 /*
 * DES Encryption
 */
-void DES::enc(const byte in[], byte out[]) const
+void DES::encrypt_n(const byte in[], byte out[], u32bit blocks) const
    {
-   u64bit T = (DES_IPTAB1[in[0]]     ) | (DES_IPTAB1[in[1]] << 1) |
-              (DES_IPTAB1[in[2]] << 2) | (DES_IPTAB1[in[3]] << 3) |
-              (DES_IPTAB1[in[4]] << 4) | (DES_IPTAB1[in[5]] << 5) |
-              (DES_IPTAB1[in[6]] << 6) | (DES_IPTAB2[in[7]]     );
+   for(u32bit i = 0; i != blocks; ++i)
+      {
+      u64bit T = (DES_IPTAB1[in[0]]     ) | (DES_IPTAB1[in[1]] << 1) |
+                 (DES_IPTAB1[in[2]] << 2) | (DES_IPTAB1[in[3]] << 3) |
+                 (DES_IPTAB1[in[4]] << 4) | (DES_IPTAB1[in[5]] << 5) |
+                 (DES_IPTAB1[in[6]] << 6) | (DES_IPTAB2[in[7]]     );
 
-   u32bit L = static_cast<u32bit>(T >> 32);
-   u32bit R = static_cast<u32bit>(T);
+      u32bit L = static_cast<u32bit>(T >> 32);
+      u32bit R = static_cast<u32bit>(T);
 
-   des_encrypt(L, R, round_key);
+      des_encrypt(L, R, round_key);
 
-   T = (DES_FPTAB1[get_byte(0, L)] << 5) | (DES_FPTAB1[get_byte(1, L)] << 3) |
-       (DES_FPTAB1[get_byte(2, L)] << 1) | (DES_FPTAB2[get_byte(3, L)] << 1) |
-       (DES_FPTAB1[get_byte(0, R)] << 4) | (DES_FPTAB1[get_byte(1, R)] << 2) |
-       (DES_FPTAB1[get_byte(2, R)]     ) | (DES_FPTAB2[get_byte(3, R)]     );
+      T = (DES_FPTAB1[get_byte(0, L)] << 5) | (DES_FPTAB1[get_byte(1, L)] << 3) |
+          (DES_FPTAB1[get_byte(2, L)] << 1) | (DES_FPTAB2[get_byte(3, L)] << 1) |
+          (DES_FPTAB1[get_byte(0, R)] << 4) | (DES_FPTAB1[get_byte(1, R)] << 2) |
+          (DES_FPTAB1[get_byte(2, R)]     ) | (DES_FPTAB2[get_byte(3, R)]     );
+      T = rotate_left(T, 32);
 
-   T = rotate_left(T, 32);
+      store_be(T, out);
 
-   store_be(T, out);
+      in += BLOCK_SIZE;
+      out += BLOCK_SIZE;
+      }
    }
 
 /*
 * DES Decryption
 */
-void DES::dec(const byte in[], byte out[]) const
+void DES::decrypt_n(const byte in[], byte out[], u32bit blocks) const
    {
-   u64bit T = (DES_IPTAB1[in[0]]     ) | (DES_IPTAB1[in[1]] << 1) |
-              (DES_IPTAB1[in[2]] << 2) | (DES_IPTAB1[in[3]] << 3) |
-              (DES_IPTAB1[in[4]] << 4) | (DES_IPTAB1[in[5]] << 5) |
-              (DES_IPTAB1[in[6]] << 6) | (DES_IPTAB2[in[7]]     );
+   for(u32bit i = 0; i != blocks; ++i)
+      {
+      u64bit T = (DES_IPTAB1[in[0]]     ) | (DES_IPTAB1[in[1]] << 1) |
+                 (DES_IPTAB1[in[2]] << 2) | (DES_IPTAB1[in[3]] << 3) |
+                 (DES_IPTAB1[in[4]] << 4) | (DES_IPTAB1[in[5]] << 5) |
+                 (DES_IPTAB1[in[6]] << 6) | (DES_IPTAB2[in[7]]     );
 
-   u32bit L = static_cast<u32bit>(T >> 32);
-   u32bit R = static_cast<u32bit>(T);
+      u32bit L = static_cast<u32bit>(T >> 32);
+      u32bit R = static_cast<u32bit>(T);
 
-   des_decrypt(L, R, round_key);
+      des_decrypt(L, R, round_key);
 
-   T = (DES_FPTAB1[get_byte(0, L)] << 5) | (DES_FPTAB1[get_byte(1, L)] << 3) |
-       (DES_FPTAB1[get_byte(2, L)] << 1) | (DES_FPTAB2[get_byte(3, L)] << 1) |
-       (DES_FPTAB1[get_byte(0, R)] << 4) | (DES_FPTAB1[get_byte(1, R)] << 2) |
-       (DES_FPTAB1[get_byte(2, R)]     ) | (DES_FPTAB2[get_byte(3, R)]     );
+      T = (DES_FPTAB1[get_byte(0, L)] << 5) | (DES_FPTAB1[get_byte(1, L)] << 3) |
+          (DES_FPTAB1[get_byte(2, L)] << 1) | (DES_FPTAB2[get_byte(3, L)] << 1) |
+          (DES_FPTAB1[get_byte(0, R)] << 4) | (DES_FPTAB1[get_byte(1, R)] << 2) |
+          (DES_FPTAB1[get_byte(2, R)]     ) | (DES_FPTAB2[get_byte(3, R)]     );
 
-   T = rotate_left(T, 32);
+      T = rotate_left(T, 32);
 
-   store_be(T, out);
+      store_be(T, out);
+
+      in += BLOCK_SIZE;
+      out += BLOCK_SIZE;
+      }
    }
 
 /*
@@ -197,55 +208,67 @@ void DES::key_schedule(const byte key[], u32bit)
 /*
 * TripleDES Encryption
 */
-void TripleDES::enc(const byte in[], byte out[]) const
+void TripleDES::encrypt_n(const byte in[], byte out[], u32bit blocks) const
    {
-   u64bit T = (DES_IPTAB1[in[0]]     ) | (DES_IPTAB1[in[1]] << 1) |
-              (DES_IPTAB1[in[2]] << 2) | (DES_IPTAB1[in[3]] << 3) |
-              (DES_IPTAB1[in[4]] << 4) | (DES_IPTAB1[in[5]] << 5) |
-              (DES_IPTAB1[in[6]] << 6) | (DES_IPTAB2[in[7]]     );
+   for(u32bit i = 0; i != blocks; ++i)
+      {
+      u64bit T = (DES_IPTAB1[in[0]]     ) | (DES_IPTAB1[in[1]] << 1) |
+                 (DES_IPTAB1[in[2]] << 2) | (DES_IPTAB1[in[3]] << 3) |
+                 (DES_IPTAB1[in[4]] << 4) | (DES_IPTAB1[in[5]] << 5) |
+                 (DES_IPTAB1[in[6]] << 6) | (DES_IPTAB2[in[7]]     );
 
-   u32bit L = static_cast<u32bit>(T >> 32);
-   u32bit R = static_cast<u32bit>(T);
+      u32bit L = static_cast<u32bit>(T >> 32);
+      u32bit R = static_cast<u32bit>(T);
 
-   des_encrypt(L, R, round_key);
-   des_decrypt(R, L, round_key + 32);
-   des_encrypt(L, R, round_key + 64);
+      des_encrypt(L, R, round_key);
+      des_decrypt(R, L, round_key + 32);
+      des_encrypt(L, R, round_key + 64);
 
-   T = (DES_FPTAB1[get_byte(0, L)] << 5) | (DES_FPTAB1[get_byte(1, L)] << 3) |
-       (DES_FPTAB1[get_byte(2, L)] << 1) | (DES_FPTAB2[get_byte(3, L)] << 1) |
-       (DES_FPTAB1[get_byte(0, R)] << 4) | (DES_FPTAB1[get_byte(1, R)] << 2) |
-       (DES_FPTAB1[get_byte(2, R)]     ) | (DES_FPTAB2[get_byte(3, R)]     );
+      T = (DES_FPTAB1[get_byte(0, L)] << 5) | (DES_FPTAB1[get_byte(1, L)] << 3) |
+          (DES_FPTAB1[get_byte(2, L)] << 1) | (DES_FPTAB2[get_byte(3, L)] << 1) |
+          (DES_FPTAB1[get_byte(0, R)] << 4) | (DES_FPTAB1[get_byte(1, R)] << 2) |
+          (DES_FPTAB1[get_byte(2, R)]     ) | (DES_FPTAB2[get_byte(3, R)]     );
 
-   T = rotate_left(T, 32);
+      T = rotate_left(T, 32);
 
-   store_be(T, out);
+      store_be(T, out);
+
+      in += BLOCK_SIZE;
+      out += BLOCK_SIZE;
+      }
    }
 
 /*
 * TripleDES Decryption
 */
-void TripleDES::dec(const byte in[], byte out[]) const
+void TripleDES::decrypt_n(const byte in[], byte out[], u32bit blocks) const
    {
-   u64bit T = (DES_IPTAB1[in[0]]     ) | (DES_IPTAB1[in[1]] << 1) |
-              (DES_IPTAB1[in[2]] << 2) | (DES_IPTAB1[in[3]] << 3) |
-              (DES_IPTAB1[in[4]] << 4) | (DES_IPTAB1[in[5]] << 5) |
-              (DES_IPTAB1[in[6]] << 6) | (DES_IPTAB2[in[7]]     );
+   for(u32bit i = 0; i != blocks; ++i)
+      {
+      u64bit T = (DES_IPTAB1[in[0]]     ) | (DES_IPTAB1[in[1]] << 1) |
+                 (DES_IPTAB1[in[2]] << 2) | (DES_IPTAB1[in[3]] << 3) |
+                 (DES_IPTAB1[in[4]] << 4) | (DES_IPTAB1[in[5]] << 5) |
+                 (DES_IPTAB1[in[6]] << 6) | (DES_IPTAB2[in[7]]     );
 
-   u32bit L = static_cast<u32bit>(T >> 32);
-   u32bit R = static_cast<u32bit>(T);
+      u32bit L = static_cast<u32bit>(T >> 32);
+      u32bit R = static_cast<u32bit>(T);
 
-   des_decrypt(L, R, round_key + 64);
-   des_encrypt(R, L, round_key + 32);
-   des_decrypt(L, R, round_key);
+      des_decrypt(L, R, round_key + 64);
+      des_encrypt(R, L, round_key + 32);
+      des_decrypt(L, R, round_key);
 
-   T = (DES_FPTAB1[get_byte(0, L)] << 5) | (DES_FPTAB1[get_byte(1, L)] << 3) |
-       (DES_FPTAB1[get_byte(2, L)] << 1) | (DES_FPTAB2[get_byte(3, L)] << 1) |
-       (DES_FPTAB1[get_byte(0, R)] << 4) | (DES_FPTAB1[get_byte(1, R)] << 2) |
-       (DES_FPTAB1[get_byte(2, R)]     ) | (DES_FPTAB2[get_byte(3, R)]     );
+      T = (DES_FPTAB1[get_byte(0, L)] << 5) | (DES_FPTAB1[get_byte(1, L)] << 3) |
+          (DES_FPTAB1[get_byte(2, L)] << 1) | (DES_FPTAB2[get_byte(3, L)] << 1) |
+          (DES_FPTAB1[get_byte(0, R)] << 4) | (DES_FPTAB1[get_byte(1, R)] << 2) |
+          (DES_FPTAB1[get_byte(2, R)]     ) | (DES_FPTAB2[get_byte(3, R)]     );
 
-   T = rotate_left(T, 32);
+      T = rotate_left(T, 32);
 
-   store_be(T, out);
+      store_be(T, out);
+
+      in += BLOCK_SIZE;
+      out += BLOCK_SIZE;
+      }
    }
 
 /*
diff --git a/src/block/des/des.h b/src/block/des/des.h
index 6fa59de5e..b28990178 100644
--- a/src/block/des/des.h
+++ b/src/block/des/des.h
@@ -18,13 +18,15 @@ namespace Botan {
 class BOTAN_DLL DES : public BlockCipher
    {
    public:
-      void clear() throw() { round_key.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() { round_key.clear(); }
       std::string name() const { return "DES"; }
       BlockCipher* clone() const { return new DES; }
+
       DES() : BlockCipher(8, 8) {}
    private:
-      void enc(const byte[], byte[]) const;
-      void dec(const byte[], byte[]) const;
       void key_schedule(const byte[], u32bit);
 
       SecureBuffer<u32bit, 32> round_key;
@@ -36,13 +38,15 @@ class BOTAN_DLL DES : public BlockCipher
 class BOTAN_DLL TripleDES : public BlockCipher
    {
    public:
-      void clear() throw() { round_key.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() { round_key.clear(); }
       std::string name() const { return "TripleDES"; }
       BlockCipher* clone() const { return new TripleDES; }
+
       TripleDES() : BlockCipher(8, 16, 24, 8) {}
    private:
-      void enc(const byte[], byte[]) const;
-      void dec(const byte[], byte[]) const;
       void key_schedule(const byte[], u32bit);
 
       SecureBuffer<u32bit, 96> round_key;
diff --git a/src/block/des/desx.cpp b/src/block/des/desx.cpp
index e557901d3..1fc1c47f2 100644
--- a/src/block/des/desx.cpp
+++ b/src/block/des/desx.cpp
@@ -13,21 +13,33 @@ namespace Botan {
 /*
 * DESX Encryption
 */
-void DESX::enc(const byte in[], byte out[]) const
+void DESX::encrypt_n(const byte in[], byte out[], u32bit blocks) const
    {
-   xor_buf(out, in, K1.begin(), BLOCK_SIZE);
-   des.encrypt(out);
-   xor_buf(out, K2.begin(), BLOCK_SIZE);
+   for(u32bit i = 0; i != blocks; ++i)
+      {
+      xor_buf(out, in, K1.begin(), BLOCK_SIZE);
+      des.encrypt(out);
+      xor_buf(out, K2.begin(), BLOCK_SIZE);
+
+      in += BLOCK_SIZE;
+      out += BLOCK_SIZE;
+      }
    }
 
 /*
 * DESX Decryption
 */
-void DESX::dec(const byte in[], byte out[]) const
+void DESX::decrypt_n(const byte in[], byte out[], u32bit blocks) const
    {
-   xor_buf(out, in, K2.begin(), BLOCK_SIZE);
-   des.decrypt(out);
-   xor_buf(out, K1.begin(), BLOCK_SIZE);
+   for(u32bit i = 0; i != blocks; ++i)
+      {
+      xor_buf(out, in, K2.begin(), BLOCK_SIZE);
+      des.decrypt(out);
+      xor_buf(out, K1.begin(), BLOCK_SIZE);
+
+      in += BLOCK_SIZE;
+      out += BLOCK_SIZE;
+      }
    }
 
 /*
diff --git a/src/block/des/desx.h b/src/block/des/desx.h
index 49ecc2421..89664d064 100644
--- a/src/block/des/desx.h
+++ b/src/block/des/desx.h
@@ -18,13 +18,15 @@ namespace Botan {
 class BOTAN_DLL DESX : public BlockCipher
    {
    public:
-      void clear() throw() { des.clear(); K1.clear(); K2.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() { des.clear(); K1.clear(); K2.clear(); }
       std::string name() const { return "DESX"; }
       BlockCipher* clone() const { return new DESX; }
+
       DESX() : BlockCipher(8, 24) {}
    private:
-      void enc(const byte[], byte[]) const;
-      void dec(const byte[], byte[]) const;
       void key_schedule(const byte[], u32bit);
       SecureBuffer<byte, 8> K1, K2;
       DES des;
diff --git a/src/block/des/info.txt b/src/block/des/info.txt
index ed05979c9..8e4f4e82d 100644
--- a/src/block/des/info.txt
+++ b/src/block/des/info.txt
@@ -1,13 +1 @@
-realname "DES"
-
 define DES
-
-load_on auto
-
-<add>
-des.cpp
-des.h
-des_tab.cpp
-desx.h
-desx.cpp
-</add>