Merge branch 'master' of git://git-nokia.trolltech.com.au/qtsoftware/research/qtuitest

1 files changed, 44 insertions, 0 deletions

diff --git a/botan/src/s2k/pbkdf1/pbkdf1.h b/botan/src/s2k/pbkdf1/pbkdf1.h
new file mode 100644
index 0000000..4e5cafd
--- /dev/null
+++ b/botan/src/s2k/pbkdf1/pbkdf1.h
@@ -0,0 +1,44 @@
+/*
+* PBKDF1
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
+
+#ifndef BOTAN_PBKDF1_H__
+#define BOTAN_PBKDF1_H__
+
+#include <botan/s2k.h>
+#include <botan/hash.h>
+
+namespace Botan {
+
+/**
+* This class implements the PKCS #5 PBKDF1 functionality.
+*/
+class BOTAN_DLL PKCS5_PBKDF1 : public S2K
+   {
+   public:
+      std::string name() const;
+      S2K* clone() const;
+
+      /**
+      * Create a PKCS #5 instance using the specified hash function.
+      * @param hash a pointer to a hash function object to use
+      */
+      PKCS5_PBKDF1(HashFunction* hash_in) : hash(hash_in) {}
+
+      PKCS5_PBKDF1(const PKCS5_PBKDF1& other) :
+         S2K(), hash(other.hash->clone()) {}
+
+      ~PKCS5_PBKDF1() { delete hash; }
+   private:
+      OctetString derive(u32bit, const std::string&,
+                          const byte[], u32bit, u32bit) const;
+
+      HashFunction* hash;
+   };
+
+}
+
+#endif