diff options
author | Keith Isdale <keith.isdale@nokia.com> | 2010-07-26 14:56:53 +1000 |
---|---|---|
committer | Keith Isdale <keith.isdale@nokia.com> | 2010-07-26 14:56:53 +1000 |
commit | 9f034793bcfc51c2b7c1dd14db806f7258f9a9eb (patch) | |
tree | 63bd0f50ce5b77828ad8205eafd7b9412810499e /botan/src/s2k/s2k.cpp | |
parent | 619d92cfef29e653bfdf852e83888e50cfc4348f (diff) | |
parent | 65271649dbc90f3af1184ad1b23bdb64c0c07d07 (diff) |
Merge branch 'master' of git://git-nokia.trolltech.com.au/qtsoftware/research/qtuitest
Diffstat (limited to 'botan/src/s2k/s2k.cpp')
-rw-r--r-- | botan/src/s2k/s2k.cpp | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/botan/src/s2k/s2k.cpp b/botan/src/s2k/s2k.cpp new file mode 100644 index 0000000..b8a8ef7 --- /dev/null +++ b/botan/src/s2k/s2k.cpp @@ -0,0 +1,55 @@ +/* +* S2K +* (C) 1999-2007 Jack Lloyd +* +* Distributed under the terms of the Botan license +*/ + +#include <botan/s2k.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(RandomNumberGenerator& rng, + u32bit length) + { + salt.create(length); + rng.randomize(salt, length); + } + +} |