aboutsummaryrefslogtreecommitdiffstats
path: root/src/s2k/pbkdf1/pbkdf1.cpp
diff options
context:
space:
mode:
authorlloyd <[email protected]>2009-03-30 18:27:18 +0000
committerlloyd <[email protected]>2009-03-30 18:27:18 +0000
commit96d6eb6f29c55e16a37cf11899547886f735b065 (patch)
tree9f13901e9b44c98d58b2589c9b09c6a7443eb7cd /src/s2k/pbkdf1/pbkdf1.cpp
parent3cc3dd72c5f87b76852a55c1f2d1821dba967d8c (diff)
Thomas Moschny passed along a request from the Fedora packagers which came
up during the Fedora submission review, that each source file include some text about the license. One handy Perl script later and each file now has the line Distributed under the terms of the Botan license after the copyright notices. While I was in there modifying every file anyway, I also stripped out the remainder of the block comments (lots of astericks before and after the text); this is stylistic thing I picked up when I was first learning C++ but in retrospect it is not a good style as the structure makes it harder to modify comments (with the result that comments become fewer, shorter and are less likely to be updated, which are not good things).
Diffstat (limited to 'src/s2k/pbkdf1/pbkdf1.cpp')
-rw-r--r--src/s2k/pbkdf1/pbkdf1.cpp28
1 files changed, 15 insertions, 13 deletions
diff --git a/src/s2k/pbkdf1/pbkdf1.cpp b/src/s2k/pbkdf1/pbkdf1.cpp
index 00d1ea9ab..04e3aa453 100644
--- a/src/s2k/pbkdf1/pbkdf1.cpp
+++ b/src/s2k/pbkdf1/pbkdf1.cpp
@@ -1,15 +1,17 @@
-/*************************************************
-* PBKDF1 Source File *
-* (C) 1999-2007 Jack Lloyd *
-*************************************************/
+/*
+* 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 *
-*************************************************/
+/*
+* Return a PKCS#5 PBKDF1 derived key
+*/
OctetString PKCS5_PBKDF1::derive(u32bit key_len,
const std::string& passphrase,
const byte salt[], u32bit salt_size,
@@ -34,17 +36,17 @@ OctetString PKCS5_PBKDF1::derive(u32bit key_len,
return OctetString(key, std::min(key_len, key.size()));
}
-/*************************************************
-* Clone this type *
-*************************************************/
+/*
+* Clone this type
+*/
S2K* PKCS5_PBKDF1::clone() const
{
return new PKCS5_PBKDF1(hash->clone());
}
-/*************************************************
-* Return the name of this type *
-*************************************************/
+/*
+* Return the name of this type
+*/
std::string PKCS5_PBKDF1::name() const
{
return "PBKDF1(" + hash->name() + ")";