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

1 files changed, 34 insertions, 0 deletions

diff --git a/botan/build/botan/kdf2.h b/botan/build/botan/kdf2.h
new file mode 100644
index 0000000..f748bed
--- /dev/null
+++ b/botan/build/botan/kdf2.h
@@ -0,0 +1,34 @@
+/*
+* KDF2
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
+
+#ifndef BOTAN_KDF2_H__
+#define BOTAN_KDF2_H__
+
+#include <botan/kdf.h>
+#include <botan/hash.h>
+
+namespace Botan {
+
+/*
+* KDF2
+*/
+class BOTAN_DLL KDF2 : public KDF
+   {
+   public:
+      SecureVector<byte> derive(u32bit, const byte[], u32bit,
+                                const byte[], u32bit) const;
+
+      KDF2(HashFunction* h) : hash(h) {}
+      KDF2(const KDF2& other) : KDF(), hash(other.hash->clone()) {}
+      ~KDF2() { delete hash; }
+   private:
+      HashFunction* hash;
+   };
+
+}
+
+#endif