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

1 files changed, 55 insertions, 0 deletions

diff --git a/botan/src/s2k/pbkdf1/pbkdf1.cpp b/botan/src/s2k/pbkdf1/pbkdf1.cpp
new file mode 100644
index 0000000..04e3aa4
--- /dev/null
+++ b/botan/src/s2k/pbkdf1/pbkdf1.cpp
@@ -0,0 +1,55 @@
+/*
+* PBKDF1
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
+
+#include <botan/pbkdf1.h>
+
+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");
+
+   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()));
+   }
+
+/*
+* Clone this type
+*/
+S2K* PKCS5_PBKDF1::clone() const
+   {
+   return new PKCS5_PBKDF1(hash->clone());
+   }
+
+/*
+* Return the name of this type
+*/
+std::string PKCS5_PBKDF1::name() const
+   {
+   return "PBKDF1(" + hash->name() + ")";
+   }
+
+}