diff options
| author | lloyd <[email protected]> | 2012-04-25 13:48:08 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2012-04-25 13:48:08 +0000 |
| commit | b72a44475d06263e1492f8913310b5f29515cba6 (patch) | |
| tree | 680752dbd43999cea16851b9c196046d9e5fbd7f /src/engine/core_engine | |
| parent | edca5f211722ea6b9d99b8b5fce4603a1b9b422d (diff) | |
| parent | f14a9fdee7902ba1a4c962cfbabe29d5146e7c55 (diff) | |
propagate from branch 'net.randombit.botan.tls-state-machine' (head a4741cd07f50a9e1b29b0dd97c6fb8697c038ade)
to branch 'net.randombit.botan.cxx11' (head 116e5ff139c07000be431e07d3472cc8f3919b91)
Diffstat (limited to 'src/engine/core_engine')
| -rw-r--r-- | src/engine/core_engine/core_engine.h | 4 | ||||
| -rw-r--r-- | src/engine/core_engine/lookup_block.cpp | 8 |
2 files changed, 8 insertions, 4 deletions
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) |