Avoid test failures on missing algos

GH #369

2 files changed, 7 insertions, 5 deletions

diff --git a/src/tests/test_pbkdf.cpp b/src/tests/test_pbkdf.cpp
index 2e3b26d48..0e5d9fe68 100644
--- a/src/tests/test_pbkdf.cpp
+++ b/src/tests/test_pbkdf.cpp
@@ -25,7 +25,7 @@ class PBKDF_KAT_Tests : public Text_Based_Test
       Test::Result run_one_test(const std::string& pbkdf_name, const VarMap& vars)
          {
          Test::Result result(pbkdf_name);
-         std::unique_ptr<Botan::PBKDF> pbkdf(Botan::get_pbkdf(pbkdf_name));
+         std::unique_ptr<Botan::PBKDF> pbkdf(Botan::PBKDF::create(pbkdf_name));
 
          if(!pbkdf)
             {
diff --git a/src/tests/test_pubkey.cpp b/src/tests/test_pubkey.cpp
index d2bc4e9eb..9c8b635cd 100644
--- a/src/tests/test_pubkey.cpp
+++ b/src/tests/test_pubkey.cpp
@@ -42,7 +42,8 @@ void check_invalid_signatures(Test::Result& result,
       while(bad_sig == signature)
          bad_sig = Test::mutate_vec(bad_sig, true);
 
-      if(!result.test_eq("incorrect signature invalid", verifier.verify_message(message, bad_sig), false))
+      if(!result.test_eq("incorrect signature invalid",
+                         verifier.verify_message(message, bad_sig), false))
          {
          result.test_note("Accepted invalid signature " + Botan::hex_encode(bad_sig));
          }
@@ -103,7 +104,7 @@ PK_Signature_Generation_Test::run_one_test(const std::string&, const VarMap& var
          {
          signer.reset(new Botan::PK_Signer(*privkey, padding, Botan::IEEE_1363, sign_provider));
          }
-      catch(Botan::Lookup_Error)
+      catch(...)
          {
          //result.test_note("Skipping signing with " + sign_provider);
          continue;
@@ -130,13 +131,14 @@ PK_Signature_Generation_Test::run_one_test(const std::string&, const VarMap& var
             {
             verifier.reset(new Botan::PK_Verifier(*pubkey, padding, Botan::IEEE_1363, verify_provider));
             }
-         catch(Botan::Lookup_Error)
+         catch(...)
             {
             //result.test_note("Skipping verifying with " + verify_provider);
             continue;
             }
 
-         if(!result.test_eq("generated signature valid", verifier->verify_message(message, generated_signature), true))
+         if(!result.test_eq("generated signature valid",
+                            verifier->verify_message(message, generated_signature), true))
             {
             result.test_failure("generated signature", generated_signature);
             }