Initial checkin1.5.6

1 files changed, 53 insertions, 0 deletions

diff --git a/src/s2k.cpp b/src/s2k.cpp
new file mode 100644
index 000000000..aa8beb212
--- /dev/null
+++ b/src/s2k.cpp
@@ -0,0 +1,53 @@
+/*************************************************
+* S2K Source File                                *
+* (C) 1999-2006 The Botan Project                *
+*************************************************/
+
+#include <botan/s2k.h>
+#include <botan/rng.h>
+
+namespace Botan {
+
+/*************************************************
+* Derive a key from a passphrase                 *
+*************************************************/
+OctetString S2K::derive_key(u32bit key_len,
+                            const std::string& passphrase) const
+   {
+   return derive(key_len, passphrase, salt, salt.size(), iterations());
+   }
+
+/*************************************************
+* Set the number of iterations                   *
+*************************************************/
+void S2K::set_iterations(u32bit i)
+   {
+   iter = i;
+   }
+
+/*************************************************
+* Change the salt                                *
+*************************************************/
+void S2K::change_salt(const byte new_salt[], u32bit length)
+   {
+   salt.set(new_salt, length);
+   }
+
+/*************************************************
+* Change the salt                                *
+*************************************************/
+void S2K::change_salt(const MemoryRegion<byte>& new_salt)
+   {
+   change_salt(new_salt.begin(), new_salt.size());
+   }
+
+/*************************************************
+* Create a new random salt                       *
+*************************************************/
+void S2K::new_random_salt(u32bit length)
+   {
+   salt.create(length);
+   Global_RNG::randomize(salt, length);
+   }
+
+}