aboutsummaryrefslogtreecommitdiffstats
path: root/src/s2k/s2k.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/s2k/s2k.cpp')
-rw-r--r--src/s2k/s2k.cpp40
1 files changed, 21 insertions, 19 deletions
diff --git a/src/s2k/s2k.cpp b/src/s2k/s2k.cpp
index 9c67aef10..b8a8ef719 100644
--- a/src/s2k/s2k.cpp
+++ b/src/s2k/s2k.cpp
@@ -1,48 +1,50 @@
-/*************************************************
-* S2K Source File *
-* (C) 1999-2007 Jack Lloyd *
-*************************************************/
+/*
+* 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 *
-*************************************************/
+/*
+* 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 *
-*************************************************/
+/*
+* Set the number of iterations
+*/
void S2K::set_iterations(u32bit i)
{
iter = i;
}
-/*************************************************
-* Change the salt *
-*************************************************/
+/*
+* Change the salt
+*/
void S2K::change_salt(const byte new_salt[], u32bit length)
{
salt.set(new_salt, length);
}
-/*************************************************
-* Change the salt *
-*************************************************/
+/*
+* 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 *
-*************************************************/
+/*
+* Create a new random salt
+*/
void S2K::new_random_salt(RandomNumberGenerator& rng,
u32bit length)
{