Remove lookup/libstate dependency on Lion, KDF1, KDF2, EMSA[1-4]

2 files changed, 2 insertions, 4 deletions

diff --git a/src/pk_pad/emsa3/emsa3.cpp b/src/pk_pad/emsa3/emsa3.cpp
index 255366503..060dd40d8 100644
--- a/src/pk_pad/emsa3/emsa3.cpp
+++ b/src/pk_pad/emsa3/emsa3.cpp
@@ -5,7 +5,6 @@
 
 #include <botan/emsa3.h>
 #include <botan/hash_id.h>
-#include <botan/lookup.h>
 
 namespace Botan {
 
@@ -88,9 +87,8 @@ bool EMSA3::verify(const MemoryRegion<byte>& coded,
 /*************************************************
 * EMSA3 Constructor                              *
 *************************************************/
-EMSA3::EMSA3(const std::string& hash_name)
+EMSA3::EMSA3(HashFunction* hash_in) : hash(hash_in)
    {
-   hash = get_hash(hash_name);
    hash_id = pkcs_hash_id(hash->name());
    }
 
diff --git a/src/pk_pad/emsa3/emsa3.h b/src/pk_pad/emsa3/emsa3.h
index bdaec5c42..7c0d87147 100644
--- a/src/pk_pad/emsa3/emsa3.h
+++ b/src/pk_pad/emsa3/emsa3.h
@@ -16,7 +16,7 @@ namespace Botan {
 class BOTAN_DLL EMSA3 : public EMSA
    {
    public:
-      EMSA3(const std::string&);
+      EMSA3(HashFunction* hash);
       ~EMSA3() { delete hash; }
    private:
       void update(const byte[], u32bit);