merge of '22c256e152c9765e98afa4d164af3f6783e96257'

     and '561b7dbb17d3809ca98a31b718ee55ae9d52cb2c'

1 files changed, 11 insertions, 4 deletions

diff --git a/checks/bench.cpp b/checks/bench.cpp
index cfb44070d..d3f9be391 100644
--- a/checks/bench.cpp
+++ b/checks/bench.cpp
@@ -179,10 +179,17 @@ bool bench_algo(const std::string& algo,
 
       std::string cipher = algo_parts[0];
 
-      u32bit cipher_keylen =
-         af.prototype_block_cipher(cipher)->MAXIMUM_KEYLENGTH;
-      u32bit cipher_ivlen =
-         af.prototype_block_cipher(cipher)->BLOCK_SIZE;
+      const Botan::BlockCipher* proto_cipher =
+         af.prototype_block_cipher(cipher);
+
+      if(!proto_cipher)
+         {
+         std::cout << "Unknown algorithm " << cipher << "\n";
+         return false;
+         }
+
+      u32bit cipher_keylen = proto_cipher->MAXIMUM_KEYLENGTH;
+      u32bit cipher_ivlen = proto_cipher->BLOCK_SIZE;
 
       if(algo_parts[1] == "XTS")
          cipher_keylen *= 2; // hack!