Move get_pbe from libstate to new pbe_base module (in pbe/)

3 files changed, 0 insertions, 111 deletions

diff --git a/src/core/libstate/get_pbe.cpp b/src/core/libstate/get_pbe.cpp
deleted file mode 100644
index cd1ed2aa4..000000000
--- a/src/core/libstate/get_pbe.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*************************************************
-* PBE Retrieval Source File                      *
-* (C) 1999-2007 Jack Lloyd                       *
-*************************************************/
-
-#include <botan/get_pbe.h>
-#include <botan/oids.h>
-#include <botan/parsing.h>
-
-#if defined(BOTAN_HAS_PBE_PKCS_V15)
-  #include <botan/pbes1.h>
-#endif
-
-#if defined(BOTAN_HAS_PBE_PKCS_V20)
-  #include <botan/pbes2.h>
-#endif
-
-namespace Botan {
-
-/*************************************************
-* Get an encryption PBE, set new parameters      *
-*************************************************/
-PBE* get_pbe(const std::string& pbe_name)
-   {
-   std::vector<std::string> algo_name;
-   algo_name = parse_algorithm_name(pbe_name);
-
-   if(algo_name.size() != 3)
-      throw Invalid_Algorithm_Name(pbe_name);
-
-   const std::string pbe = algo_name[0];
-   const std::string digest = algo_name[1];
-   const std::string cipher = algo_name[2];
-
-   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);
-#endif
-
-#if defined(BOTAN_HAS_PBE_PKCS_V20)
-   if(!pbe_obj && pbe == "PBE-PKCS5v20")
-      pbe_obj = new PBE_PKCS5v20(digest, cipher);
-#endif
-
-   if(!pbe_obj)
-      throw Algorithm_Not_Found(pbe_name);
-
-   return pbe_obj;
-   }
-
-/*************************************************
-* Get a decryption PBE, decode parameters        *
-*************************************************/
-PBE* get_pbe(const OID& pbe_oid, DataSource& params)
-   {
-   std::vector<std::string> algo_name;
-   algo_name = parse_algorithm_name(OIDS::lookup(pbe_oid));
-
-   if(algo_name.size() < 1)
-      throw Invalid_Algorithm_Name(pbe_oid.as_string());
-   const std::string pbe_algo = algo_name[0];
-
-   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")
-      {
-#if defined(BOTAN_HAS_PBE_PKCS_V20)
-      return new PBE_PKCS5v20(params);
-#endif
-      }
-
-   throw Algorithm_Not_Found(pbe_oid.as_string());
-   }
-
-}
diff --git a/src/core/libstate/get_pbe.h b/src/core/libstate/get_pbe.h
deleted file mode 100644
index e7b434c1f..000000000
--- a/src/core/libstate/get_pbe.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*************************************************
-* PBE Lookup Header File                         *
-* (C) 1999-2007 Jack Lloyd                       *
-*************************************************/
-
-#ifndef BOTAN_LOOKUP_PBE_H__
-#define BOTAN_LOOKUP_PBE_H__
-
-#include <botan/pbe.h>
-#include <string>
-
-namespace Botan {
-
-/*************************************************
-* Get a PBE object                               *
-*************************************************/
-BOTAN_DLL PBE* get_pbe(const std::string&);
-BOTAN_DLL PBE* get_pbe(const OID&, DataSource&);
-
-}
-
-#endif
diff --git a/src/core/libstate/info.txt b/src/core/libstate/info.txt
index 81076718d..59f318a95 100644
--- a/src/core/libstate/info.txt
+++ b/src/core/libstate/info.txt
@@ -13,8 +13,6 @@ eng_def.h
 engine.cpp
 engine.h
 get_enc.cpp
-get_pbe.cpp
-get_pbe.h
 init.h
 init_def.cpp
 init_opt.cpp