propagate from branch 'net.randombit.botan.tls-state-machine' (head a4741cd07f50a9e1b29b0dd97c6fb8697c038ade)

            to branch 'net.randombit.botan.cxx11' (head 116e5ff139c07000be431e07d3472cc8f3919b91)

2 files changed, 175 insertions, 95 deletions

diff --git a/src/block/camellia/camellia.cpp b/src/block/camellia/camellia.cpp
index 054558c35..2b4862efc 100644
--- a/src/block/camellia/camellia.cpp
+++ b/src/block/camellia/camellia.cpp
@@ -12,6 +12,8 @@ namespace Botan {
 
 namespace Camellia_F {
 
+namespace {
+
 u64bit F(u64bit v, u64bit K)
    {
    static const byte SBOX[256] = {
@@ -101,101 +103,11 @@ u64bit left_rot_lo(u64bit h, u64bit l, size_t shift)
    return (h >> (64-shift)) | (l << shift);
    }
 
-}
-
-/*
-* Camellia Encryption
-*/
-void Camellia::encrypt_n(const byte in[], byte out[], size_t blocks) const
-   {
-   using namespace Camellia_F;
-
-   for(size_t i = 0; i != blocks; ++i)
-      {
-      u64bit D1 = load_be<u64bit>(in, 0);
-      u64bit D2 = load_be<u64bit>(in, 1);
-
-      const u64bit* K = &SK[0];
-
-      D1 ^= *K++;
-      D2 ^= *K++;
-
-      while(true)
-         {
-         D2 ^= F(D1, *K++);
-         D1 ^= F(D2, *K++);
-         D2 ^= F(D1, *K++);
-         D1 ^= F(D2, *K++);
-         D2 ^= F(D1, *K++);
-         D1 ^= F(D2, *K++);
-
-         if(K == &SK[SK.size()-2])
-            break;
-
-         D1 = FL   (D1, *K++);
-         D2 = FLINV(D2, *K++);
-         }
-
-      D2 ^= *K++;
-      D1 ^= *K++;
-
-      store_be(out, D2, D1);
-
-      in += BLOCK_SIZE;
-      out += BLOCK_SIZE;
-      }
-   }
-
-/*
-* Camellia Decryption
-*/
-void Camellia::decrypt_n(const byte in[], byte out[], size_t blocks) const
-   {
-   using namespace Camellia_F;
-
-   for(size_t i = 0; i != blocks; ++i)
-      {
-      u64bit D1 = load_be<u64bit>(in, 0);
-      u64bit D2 = load_be<u64bit>(in, 1);
-
-      const u64bit* K = &SK[SK.size()-1];
-
-      D2 ^= *K--;
-      D1 ^= *K--;
-
-      while(true)
-         {
-         D2 ^= F(D1, *K--);
-         D1 ^= F(D2, *K--);
-         D2 ^= F(D1, *K--);
-         D1 ^= F(D2, *K--);
-         D2 ^= F(D1, *K--);
-         D1 ^= F(D2, *K--);
-
-         if(K == &SK[1])
-            break;
-
-         D1 = FL   (D1, *K--);
-         D2 = FLINV(D2, *K--);
-         }
-
-      D1 ^= *K--;
-      D2 ^= *K;
-
-      store_be(out, D2, D1);
-
-      in += BLOCK_SIZE;
-      out += BLOCK_SIZE;
-      }
-   }
-
 /*
 * Camellia Key Schedule
 */
-void Camellia::key_schedule(const byte key[], size_t length)
+void key_schedule(SecureVector<u64bit>& SK, const byte key[], size_t length)
    {
-   using namespace Camellia_F;
-
    const u64bit Sigma1 = 0xA09E667F3BCC908B;
    const u64bit Sigma2 = 0xB67AE8584CAA73B2;
    const u64bit Sigma3 = 0xC6EF372FE94F82BE;
@@ -308,4 +220,136 @@ void Camellia::key_schedule(const byte key[], size_t length)
       }
    }
 
+
+/*
+* Camellia Encryption
+*/
+void encrypt(const byte in[], byte out[], size_t blocks, const SecureVector<u64bit>& SK)
+   {
+   for(size_t i = 0; i != blocks; ++i)
+      {
+      u64bit D1 = load_be<u64bit>(in, 0);
+      u64bit D2 = load_be<u64bit>(in, 1);
+
+      const u64bit* K = &SK[0];
+
+      D1 ^= *K++;
+      D2 ^= *K++;
+
+      while(true)
+         {
+         D2 ^= F(D1, *K++);
+         D1 ^= F(D2, *K++);
+         D2 ^= F(D1, *K++);
+         D1 ^= F(D2, *K++);
+         D2 ^= F(D1, *K++);
+         D1 ^= F(D2, *K++);
+
+         if(K == &SK[SK.size()-2])
+            break;
+
+         D1 = FL   (D1, *K++);
+         D2 = FLINV(D2, *K++);
+         }
+
+      D2 ^= *K++;
+      D1 ^= *K++;
+
+      store_be(out, D2, D1);
+
+      in += 16;
+      out += 16;
+      }
+   }
+
+/*
+* Camellia Decryption
+*/
+void decrypt(const byte in[], byte out[], size_t blocks, const SecureVector<u64bit>& SK)
+   {
+   for(size_t i = 0; i != blocks; ++i)
+      {
+      u64bit D1 = load_be<u64bit>(in, 0);
+      u64bit D2 = load_be<u64bit>(in, 1);
+
+      const u64bit* K = &SK[SK.size()-1];
+
+      D2 ^= *K--;
+      D1 ^= *K--;
+
+      while(true)
+         {
+         D2 ^= F(D1, *K--);
+         D1 ^= F(D2, *K--);
+         D2 ^= F(D1, *K--);
+         D1 ^= F(D2, *K--);
+         D2 ^= F(D1, *K--);
+         D1 ^= F(D2, *K--);
+
+         if(K == &SK[1])
+            break;
+
+         D1 = FL   (D1, *K--);
+         D2 = FLINV(D2, *K--);
+         }
+
+      D1 ^= *K--;
+      D2 ^= *K;
+
+      store_be(out, D2, D1);
+
+      in += 16;
+      out += 16;
+      }
+   }
+
+}
+
+}
+
+void Camellia_128::encrypt_n(const byte in[], byte out[], size_t blocks) const
+   {
+   Camellia_F::encrypt(in, out, blocks, SK);
+   }
+
+void Camellia_192::encrypt_n(const byte in[], byte out[], size_t blocks) const
+   {
+   Camellia_F::encrypt(in, out, blocks, SK);
+   }
+
+void Camellia_256::encrypt_n(const byte in[], byte out[], size_t blocks) const
+   {
+   Camellia_F::encrypt(in, out, blocks, SK);
+   }
+
+void Camellia_128::decrypt_n(const byte in[], byte out[], size_t blocks) const
+   {
+   Camellia_F::decrypt(in, out, blocks, SK);
+   }
+
+void Camellia_192::decrypt_n(const byte in[], byte out[], size_t blocks) const
+   {
+   Camellia_F::decrypt(in, out, blocks, SK);
+   }
+
+void Camellia_256::decrypt_n(const byte in[], byte out[], size_t blocks) const
+   {
+   Camellia_F::decrypt(in, out, blocks, SK);
+   }
+
+void Camellia_128::key_schedule(const byte key[], size_t length)
+   {
+   Camellia_F::key_schedule(SK, key, length);
+   }
+
+void Camellia_192::key_schedule(const byte key[], size_t length)
+   {
+   Camellia_F::key_schedule(SK, key, length);
+   }
+
+void Camellia_256::key_schedule(const byte key[], size_t length)
+   {
+   Camellia_F::key_schedule(SK, key, length);
+   }
+
 }
diff --git a/src/block/camellia/camellia.h b/src/block/camellia/camellia.h
index aaf3ad9e3..9ce305983 100644
--- a/src/block/camellia/camellia.h
+++ b/src/block/camellia/camellia.h
@@ -13,17 +13,53 @@
 namespace Botan {
 
 /**
-* Camellia
+* Camellia-128
+*/
+class BOTAN_DLL Camellia_128 : public Block_Cipher_Fixed_Params<16, 16>
+   {
+   public:
+      void encrypt_n(const byte in[], byte out[], size_t blocks) const;
+      void decrypt_n(const byte in[], byte out[], size_t blocks) const;
+
+      void clear() { SK.clear(); }
+      std::string name() const { return "Camellia-128"; }
+      BlockCipher* clone() const { return new Camellia_128; }
+   private:
+      void key_schedule(const byte key[], size_t length);
+
+      SecureVector<u64bit> SK;
+   };
+
+/**
+* Camellia-192
+*/
+class BOTAN_DLL Camellia_192 : public Block_Cipher_Fixed_Params<16, 24>
+   {
+   public:
+      void encrypt_n(const byte in[], byte out[], size_t blocks) const;
+      void decrypt_n(const byte in[], byte out[], size_t blocks) const;
+
+      void clear() { SK.clear(); }
+      std::string name() const { return "Camellia-192"; }
+      BlockCipher* clone() const { return new Camellia_192; }
+   private:
+      void key_schedule(const byte key[], size_t length);
+
+      SecureVector<u64bit> SK;
+   };
+
+/**
+* Camellia-256
 */
-class BOTAN_DLL Camellia : public Block_Cipher_Fixed_Params<16, 16, 32, 8>
+class BOTAN_DLL Camellia_256 : public Block_Cipher_Fixed_Params<16, 32>
    {
    public:
       void encrypt_n(const byte in[], byte out[], size_t blocks) const;
       void decrypt_n(const byte in[], byte out[], size_t blocks) const;
 
       void clear() { SK.clear(); }
-      std::string name() const { return "Camellia"; }
-      BlockCipher* clone() const { return new Camellia; }
+      std::string name() const { return "Camellia-256"; }
+      BlockCipher* clone() const { return new Camellia_256; }
    private:
       void key_schedule(const byte key[], size_t length);