Remove support for S2K in Engines. There are only three implementations of

an S2K in Botan, all in the core library, and it's relatively unlikely
that that many more will be added. get_s2k still exists and performs a
direct search across the possibilities.

1 files changed, 0 insertions, 29 deletions

diff --git a/src/libstate/lookup.cpp b/src/libstate/lookup.cpp
index b34a532e3..700a62a7a 100644
--- a/src/libstate/lookup.cpp
+++ b/src/libstate/lookup.cpp
@@ -54,17 +54,6 @@ MessageAuthenticationCode* get_mac(const std::string& name)
    }
 
 /*************************************************
-* Get a S2K algorithm by name                    *
-*************************************************/
-S2K* get_s2k(const std::string& name)
-   {
-   const S2K* s2k = retrieve_s2k(global_state(), name);
-   if(s2k)
-      return s2k->clone();
-   throw Algorithm_Not_Found(name);
-   }
-
-/*************************************************
 * Get a block cipher padding method by name      *
 *************************************************/
 const BlockCipherModePaddingMethod* get_bc_pad(const std::string& name)
@@ -311,24 +300,6 @@ const MessageAuthenticationCode* retrieve_mac(Library_State& libstate,
    }
 
 /*************************************************
-* Acquire a string-to-key algorithm              *
-*************************************************/
-const S2K* retrieve_s2k(Library_State& libstate,
-                        const std::string& name)
-   {
-   Library_State::Engine_Iterator i(libstate);
-
-   while(const Engine* engine = i.next())
-      {
-      const S2K* algo = engine->s2k(name);
-      if(algo)
-         return algo;
-      }
-
-   return 0;
-   }
-
-/*************************************************
 * Retrieve a block cipher padding method         *
 *************************************************/
 const BlockCipherModePaddingMethod* retrieve_bc_pad(Library_State& libstate,