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

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

5 files changed, 11 insertions, 7 deletions

diff --git a/src/engine/asm_engine/asm_engine.h b/src/engine/asm_engine/asm_engine.h
index bd82566d3..40fe5342f 100644
--- a/src/engine/asm_engine/asm_engine.h
+++ b/src/engine/asm_engine/asm_engine.h
@@ -23,7 +23,7 @@ class Assembler_Engine : public Engine
       BlockCipher* find_block_cipher(const SCAN_Name&,
                                      Algorithm_Factory&) const;
 
-      HashFunction* find_hash(const SCAN_Name& reqeust,
+      HashFunction* find_hash(const SCAN_Name& request,
                               Algorithm_Factory&) const;
    };
 
diff --git a/src/engine/core_engine/core_engine.h b/src/engine/core_engine/core_engine.h
index 5386991c3..983b75290 100644
--- a/src/engine/core_engine/core_engine.h
+++ b/src/engine/core_engine/core_engine.h
@@ -44,10 +44,10 @@ class Core_Engine : public Engine
       StreamCipher* find_stream_cipher(const SCAN_Name&,
                                        Algorithm_Factory&) const;
 
-      HashFunction* find_hash(const SCAN_Name& reqeust,
+      HashFunction* find_hash(const SCAN_Name& request,
                               Algorithm_Factory&) const;
 
-      MessageAuthenticationCode* find_mac(const SCAN_Name& reqeust,
+      MessageAuthenticationCode* find_mac(const SCAN_Name& request,
                                           Algorithm_Factory&) const;
 
       PBKDF* find_pbkdf(const SCAN_Name& algo_spec,
diff --git a/src/engine/core_engine/lookup_block.cpp b/src/engine/core_engine/lookup_block.cpp
index c27a13237..c46d4f4cd 100644
--- a/src/engine/core_engine/lookup_block.cpp
+++ b/src/engine/core_engine/lookup_block.cpp
@@ -135,8 +135,12 @@ BlockCipher* Core_Engine::find_block_cipher(const SCAN_Name& request,
 #endif
 
 #if defined(BOTAN_HAS_CAMELLIA)
-   if(request.algo_name() == "Camellia")
-      return new Camellia;
+   if(request.algo_name() == "Camellia-128")
+      return new Camellia_128;
+   if(request.algo_name() == "Camellia-192")
+      return new Camellia_192;
+   if(request.algo_name() == "Camellia-256")
+      return new Camellia_256;
 #endif
 
 #if defined(BOTAN_HAS_CAST)
diff --git a/src/engine/openssl/ossl_arc4.cpp b/src/engine/openssl/ossl_arc4.cpp
index 799206ce1..6469d263a 100644
--- a/src/engine/openssl/ossl_arc4.cpp
+++ b/src/engine/openssl/ossl_arc4.cpp
@@ -71,7 +71,7 @@ void ARC4_OpenSSL::cipher(const byte in[], byte out[], size_t length)
 }
 
 /**
-* Look for an OpenSSL-suported stream cipher (ARC4)
+* Look for an OpenSSL-supported stream cipher (ARC4)
 */
 StreamCipher*
 OpenSSL_Engine::find_stream_cipher(const SCAN_Name& request,
diff --git a/src/engine/simd_engine/simd_engine.h b/src/engine/simd_engine/simd_engine.h
index 73f7d2233..66c8886f1 100644
--- a/src/engine/simd_engine/simd_engine.h
+++ b/src/engine/simd_engine/simd_engine.h
@@ -23,7 +23,7 @@ class SIMD_Engine : public Engine
       BlockCipher* find_block_cipher(const SCAN_Name&,
                                      Algorithm_Factory&) const;
 
-      HashFunction* find_hash(const SCAN_Name& reqeust,
+      HashFunction* find_hash(const SCAN_Name& request,
                               Algorithm_Factory&) const;
    };