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

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

1 files changed, 40 insertions, 4 deletions

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);