Make two variants of get_pbe more consistent

1 files changed, 11 insertions, 13 deletions

diff --git a/src/pbe/get_pbe.cpp b/src/pbe/get_pbe.cpp
index cd1ed2aa4..c9f40f47a 100644
--- a/src/pbe/get_pbe.cpp
+++ b/src/pbe/get_pbe.cpp
@@ -35,19 +35,16 @@ PBE* get_pbe(const std::string& pbe_name)
    PBE* pbe_obj = 0;
 
 #if defined(BOTAN_HAS_PBE_PKCS_V15)
-   if(!pbe_obj && pbe == "PBE-PKCS5v15")
-      pbe_obj = new PBE_PKCS5v15(digest, cipher, ENCRYPTION);
+   if(pbe == "PBE-PKCS5v15")
+      return new PBE_PKCS5v15(digest, cipher, ENCRYPTION);
 #endif
 
 #if defined(BOTAN_HAS_PBE_PKCS_V20)
-   if(!pbe_obj && pbe == "PBE-PKCS5v20")
-      pbe_obj = new PBE_PKCS5v20(digest, cipher);
+   if(pbe == "PBE-PKCS5v20")
+      return new PBE_PKCS5v20(digest, cipher);
 #endif
 
-   if(!pbe_obj)
-      throw Algorithm_Not_Found(pbe_name);
-
-   return pbe_obj;
+   throw Algorithm_Not_Found(pbe_name);
    }
 
 /*************************************************
@@ -62,24 +59,25 @@ PBE* get_pbe(const OID& pbe_oid, DataSource& params)
       throw Invalid_Algorithm_Name(pbe_oid.as_string());
    const std::string pbe_algo = algo_name[0];
 
+#if defined(BOTAN_HAS_PBE_PKCS_V15)
    if(pbe_algo == "PBE-PKCS5v15")
       {
-#if defined(BOTAN_HAS_PBE_PKCS_V15)
       if(algo_name.size() != 3)
          throw Invalid_Algorithm_Name(pbe_oid.as_string());
+
       const std::string digest = algo_name[1];
       const std::string cipher = algo_name[2];
+
       PBE* pbe = new PBE_PKCS5v15(digest, cipher, DECRYPTION);
       pbe->decode_params(params);
       return pbe;
-#endif
       }
-   else if(pbe_algo == "PBE-PKCS5v20")
-      {
+#endif
+
 #if defined(BOTAN_HAS_PBE_PKCS_V20)
+   if(pbe_algo == "PBE-PKCS5v20")
       return new PBE_PKCS5v20(params);
 #endif
-      }
 
    throw Algorithm_Not_Found(pbe_oid.as_string());
    }