3 files changed, 97 insertions, 0 deletions
diff --git a/src/kdf/pbkdf1/modinfo.txt b/src/kdf/pbkdf1/modinfo.txt
new file mode 100644
index 000000000..3c1ae802c
--- /dev/null
+++ b/src/kdf/pbkdf1/modinfo.txt
@@ -0,0 +1,10 @@
+realname "Pbkdf1"
+
+define PBKDF1
+
+load_on auto
+
+<add>
+pbkdf1.cpp
+pbkdf1.h
+</add>
diff --git a/src/kdf/pbkdf1/pbkdf1.cpp b/src/kdf/pbkdf1/pbkdf1.cpp
new file mode 100644
index 000000000..70cff9eee
--- /dev/null
+++ b/src/kdf/pbkdf1/pbkdf1.cpp
@@ -0,0 +1,57 @@
+/*************************************************
+* PBKDF1 Source File                             *
+* (C) 1999-2007 Jack Lloyd                       *
+*************************************************/
+
+#include <botan/pbkdf1.h>
+#include <botan/lookup.h>
+#include <memory>
+
+namespace Botan {
+
+/*************************************************
+* Return a PKCS#5 PBKDF1 derived key             *
+*************************************************/
+OctetString PKCS5_PBKDF1::derive(u32bit key_len,
+                                 const std::string& passphrase,
+                                 const byte salt[], u32bit salt_size,
+                                 u32bit iterations) const
+   {
+   if(iterations == 0)
+      throw Invalid_Argument("PKCS#5 PBKDF1: Invalid iteration count");
+
+   std::auto_ptr<HashFunction> hash(get_hash(hash_name));
+   if(key_len > hash->OUTPUT_LENGTH)
+      throw Exception("PKCS#5 PBKDF1: Requested output length too long");
+
+   hash->update(passphrase);
+   hash->update(salt, salt_size);
+   SecureVector<byte> key = hash->final();
+
+   for(u32bit j = 1; j != iterations; ++j)
+      {
+      hash->update(key);
+      hash->final(key);
+      }
+
+   return OctetString(key, std::min(key_len, key.size()));
+   }
+
+/*************************************************
+* Return the name of this type                   *
+*************************************************/
+std::string PKCS5_PBKDF1::name() const
+   {
+   return "PBKDF1(" + hash_name + ")";
+   }
+
+/*************************************************
+* PKCS5_PBKDF1 Constructor                       *
+*************************************************/
+PKCS5_PBKDF1::PKCS5_PBKDF1(const std::string& h_name) : hash_name(h_name)
+   {
+   if(!have_hash(hash_name))
+      throw Algorithm_Not_Found(hash_name);
+   }
+
+}
diff --git a/src/kdf/pbkdf1/pbkdf1.h b/src/kdf/pbkdf1/pbkdf1.h
new file mode 100644
index 000000000..3608bb470
--- /dev/null
+++ b/src/kdf/pbkdf1/pbkdf1.h
@@ -0,0 +1,30 @@
+/*************************************************
+* PBKDF1 Header File                             *
+* (C) 1999-2007 Jack Lloyd                       *
+*************************************************/
+
+#ifndef BOTAN_PBKDF1_H__
+#define BOTAN_PBKDF1_H__
+
+#include <botan/s2k.h>
+
+namespace Botan {
+
+/*************************************************
+* PKCS #5 PBKDF1                                 *
+*************************************************/
+class BOTAN_DLL PKCS5_PBKDF1 : public S2K
+   {
+   public:
+      std::string name() const;
+      S2K* clone() const { return new PKCS5_PBKDF1(hash_name); }
+      PKCS5_PBKDF1(const std::string&);
+   private:
+      OctetString derive(u32bit, const std::string&,
+                          const byte[], u32bit, u32bit) const;
+      const std::string hash_name;
+   };
+
+}
+
+#endif