aboutsummaryrefslogtreecommitdiffstats
path: root/src/s2k/pbkdf1
diff options
context:
space:
mode:
Diffstat (limited to 'src/s2k/pbkdf1')
-rw-r--r--src/s2k/pbkdf1/pbkdf1.cpp28
-rw-r--r--src/s2k/pbkdf1/pbkdf1.h10
2 files changed, 21 insertions, 17 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() + ")";
diff --git a/src/s2k/pbkdf1/pbkdf1.h b/src/s2k/pbkdf1/pbkdf1.h
index ccc0a61fe..4e5cafdb0 100644
--- a/src/s2k/pbkdf1/pbkdf1.h
+++ b/src/s2k/pbkdf1/pbkdf1.h
@@ -1,7 +1,9 @@
-/*************************************************
-* PBKDF1 Header File *
-* (C) 1999-2007 Jack Lloyd *
-*************************************************/
+/*
+* PBKDF1
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
#ifndef BOTAN_PBKDF1_H__
#define BOTAN_PBKDF1_H__