diff options
| author | lloyd <[email protected]> | 2012-04-24 20:09:51 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2012-04-24 20:09:51 +0000 |
| commit | 25f329b8a45b6f84f9a01a0326db48f6853dc59c (patch) | |
| tree | f9d18d9c03fdfe9832d672eac6b69dd5fd121e66 /src/engine | |
| parent | 1ffda187674d4ca21f294a4080f52182b5f4a6ed (diff) | |
Patrick Pelletier noted on the mailing list that the implementation of
Camellia exposed by the OpenSSL module is parameterized by the key
length, much as AES is, while the version in the main source uses a
single name/type for all variants. For consistency, convert to using a
key length parameterized name in our version as well. In the future
this might allow for better loop unrolling, etc but currently we don't
make use of that.
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/core_engine/lookup_block.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
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) |