5 files changed, 24 insertions, 25 deletions
diff --git a/src/lib/misc/benchmark/benchmark.cpp b/src/lib/misc/benchmark/benchmark.cpp
index 152b45d37..d5e3694b5 100644
--- a/src/lib/misc/benchmark/benchmark.cpp
+++ b/src/lib/misc/benchmark/benchmark.cpp
@@ -7,7 +7,6 @@
 
 #include <botan/benchmark.h>
 #include <botan/exceptn.h>
-#include <botan/lookup.h>
 #include <botan/buf_comp.h>
 #include <botan/cipher_mode.h>
 #include <botan/block_cipher.h>
@@ -56,10 +55,8 @@ time_algorithm_ops(const std::string& name,
 
    const double mb_mult = buffer.size() / static_cast<double>(Mebibyte);
 
-   if(BlockCipher* p = get_block_cipher(name, provider))
+   if(auto bc = BlockCipher::create(name, provider))
       {
-      std::unique_ptr<BlockCipher> bc(p);
-
       const SymmetricKey key(rng, bc->maximum_keylength());
 
       return std::map<std::string, double>({
@@ -68,10 +65,8 @@ time_algorithm_ops(const std::string& name,
             { "decrypt", mb_mult * time_op(runtime / 2, [&]() { bc->decrypt(buffer); }) },
          });
       }
-   else if(StreamCipher* p = get_stream_cipher(name, provider))
+   else if(auto sc = StreamCipher::create(name, provider))
       {
-      std::unique_ptr<StreamCipher> sc(p);
-
       const SymmetricKey key(rng, sc->maximum_keylength());
 
       return std::map<std::string, double>({
@@ -79,18 +74,14 @@ time_algorithm_ops(const std::string& name,
             { "", mb_mult * time_op(runtime, [&]() { sc->encipher(buffer); }) },
          });
       }
-   else if(HashFunction* p = get_hash_function(name, provider))
+   else if(auto h = HashFunction::create(name, provider))
       {
-      std::unique_ptr<HashFunction> h(p);
-
       return std::map<std::string, double>({
             { "", mb_mult * time_op(runtime, [&]() { h->update(buffer); }) },
          });
       }
-   else if(MessageAuthenticationCode* p = get_mac(name, provider))
+   else if(auto mac = MessageAuthenticationCode::create(name, provider))
       {
-      std::unique_ptr<MessageAuthenticationCode> mac(p);
-
       const SymmetricKey key(rng, mac->maximum_keylength());
 
       return std::map<std::string, double>({
@@ -137,10 +128,10 @@ std::set<std::string> get_all_providers_of(const std::string& algo)
 
    auto add_to_set = [&provs](const std::vector<std::string>& str) { for(auto&& s : str) { provs.insert(s); } };
 
-   add_to_set(get_block_cipher_providers(algo));
-   add_to_set(get_stream_cipher_providers(algo));
-   add_to_set(get_hash_function_providers(algo));
-   add_to_set(get_mac_providers(algo));
+   add_to_set(BlockCipher::providers(algo));
+   add_to_set(StreamCipher::providers(algo));
+   add_to_set(HashFunction::providers(algo));
+   add_to_set(MessageAuthenticationCode::providers(algo));
 
    return provs;
    }
diff --git a/src/lib/misc/cryptobox/cryptobox.cpp b/src/lib/misc/cryptobox/cryptobox.cpp
index 752561248..c0fc9b777 100644
--- a/src/lib/misc/cryptobox/cryptobox.cpp
+++ b/src/lib/misc/cryptobox/cryptobox.cpp
@@ -8,7 +8,6 @@
 #include <botan/cryptobox.h>
 #include <botan/filters.h>
 #include <botan/pipe.h>
-#include <botan/lookup.h>
 #include <botan/sha2_64.h>
 #include <botan/hmac.h>
 #include <botan/pbkdf2.h>
diff --git a/src/lib/misc/pbes2/pbes2.cpp b/src/lib/misc/pbes2/pbes2.cpp
index 89af01e9d..ab740ff5d 100644
--- a/src/lib/misc/pbes2/pbes2.cpp
+++ b/src/lib/misc/pbes2/pbes2.cpp
@@ -7,7 +7,6 @@
 
 #include <botan/pbes2.h>
 #include <botan/cipher_mode.h>
-#include <botan/lookup.h>
 #include <botan/pbkdf.h>
 #include <botan/der_enc.h>
 #include <botan/ber_dec.h>
diff --git a/src/lib/misc/rfc3394/rfc3394.cpp b/src/lib/misc/rfc3394/rfc3394.cpp
index 3e1ed8b40..582e8c92d 100644
--- a/src/lib/misc/rfc3394/rfc3394.cpp
+++ b/src/lib/misc/rfc3394/rfc3394.cpp
@@ -6,7 +6,6 @@
 */
 
 #include <botan/rfc3394.h>
-#include <botan/lookup.h>
 #include <botan/block_cipher.h>
 #include <botan/loadstor.h>
 #include <botan/exceptn.h>
@@ -22,7 +21,10 @@ secure_vector<byte> rfc3394_keywrap(const secure_vector<byte>& key,
    if(kek.size() != 16 && kek.size() != 24 && kek.size() != 32)
       throw std::invalid_argument("Bad KEK length " + std::to_string(kek.size()) + " for NIST key wrap");
 
-   std::unique_ptr<BlockCipher> aes(make_block_cipher("AES-" + std::to_string(8*kek.size())));
+   const std::string cipher_name = "AES-" + std::to_string(8*kek.size());
+   std::unique_ptr<BlockCipher> aes(BlockCipher::create(cipher_name));
+   if(!aes)
+      throw Algorithm_Not_Found(cipher_name);
    aes->set_key(kek);
 
    const size_t n = key.size() / 8;
@@ -66,7 +68,10 @@ secure_vector<byte> rfc3394_keyunwrap(const secure_vector<byte>& key,
    if(kek.size() != 16 && kek.size() != 24 && kek.size() != 32)
       throw std::invalid_argument("Bad KEK length " + std::to_string(kek.size()) + " for NIST key unwrap");
 
-   std::unique_ptr<BlockCipher> aes(make_block_cipher("AES-" + std::to_string(8*kek.size())));
+   const std::string cipher_name = "AES-" + std::to_string(8*kek.size());
+   std::unique_ptr<BlockCipher> aes(BlockCipher::create(cipher_name));
+   if(!aes)
+      throw Algorithm_Not_Found(cipher_name);
    aes->set_key(kek);
 
    const size_t n = (key.size() - 8) / 8;
diff --git a/src/lib/misc/srp6/srp6.cpp b/src/lib/misc/srp6/srp6.cpp
index d3f7338bd..f567db875 100644
--- a/src/lib/misc/srp6/srp6.cpp
+++ b/src/lib/misc/srp6/srp6.cpp
@@ -8,7 +8,6 @@
 #include <botan/srp6.h>
 #include <botan/dl_group.h>
 #include <botan/numthry.h>
-#include <botan/lookup.h>
 
 namespace Botan {
 
@@ -19,7 +18,10 @@ BigInt hash_seq(const std::string& hash_id,
                 const BigInt& in1,
                 const BigInt& in2)
    {
-   std::unique_ptr<HashFunction> hash_fn(get_hash(hash_id));
+   std::unique_ptr<HashFunction> hash_fn(HashFunction::create(hash_id));
+
+   if(!hash_fn)
+      throw Algorithm_Not_Found(hash_id);
 
    hash_fn->update(BigInt::encode_1363(in1, pad_to));
    hash_fn->update(BigInt::encode_1363(in2, pad_to));
@@ -32,7 +34,10 @@ BigInt compute_x(const std::string& hash_id,
                  const std::string& password,
                  const std::vector<byte>& salt)
    {
-   std::unique_ptr<HashFunction> hash_fn(get_hash(hash_id));
+   std::unique_ptr<HashFunction> hash_fn(HashFunction::create(hash_id));
+
+   if(!hash_fn)
+      throw Algorithm_Not_Found(hash_id);
 
    hash_fn->update(identifier);
    hash_fn->update(":");