propagate from branch 'net.randombit.botan.x509-path-validation' (head 63b5a20eab129ca13287fda33d2d02eec329708f)

            to branch 'net.randombit.botan' (head 8b8150f09c55184f028f2929c4e7f7cd0d46d96e)

1 files changed, 8 insertions, 4 deletions

diff --git a/src/engine/core_engine/lookup_block.cpp b/src/engine/core_engine/lookup_block.cpp
index c27a13237..a02c75daa 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)
@@ -273,13 +277,13 @@ BlockCipher* Core_Engine::find_block_cipher(const SCAN_Name& request,
          af.prototype_stream_cipher(request.arg(1));
 
       if(!hash || !stream_cipher)
-         return 0;
+         return nullptr;
 
       return new Lion(hash->clone(), stream_cipher->clone(), block_size);
       }
 #endif
 
-   return 0;
+   return nullptr;
    }
 
 }