From 96d6eb6f29c55e16a37cf11899547886f735b065 Mon Sep 17 00:00:00 2001
From: lloyd <lloyd@randombit.net>
Date: Mon, 30 Mar 2009 18:27:18 +0000
Subject: 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).
---
 src/s2k/pbkdf2/pbkdf2.cpp | 28 +++++++++++++++-------------
 src/s2k/pbkdf2/pbkdf2.h   | 10 ++++++----
 2 files changed, 21 insertions(+), 17 deletions(-)

(limited to 'src/s2k/pbkdf2')

diff --git a/src/s2k/pbkdf2/pbkdf2.cpp b/src/s2k/pbkdf2/pbkdf2.cpp
index baa227526..1de27c9ac 100644
--- a/src/s2k/pbkdf2/pbkdf2.cpp
+++ b/src/s2k/pbkdf2/pbkdf2.cpp
@@ -1,7 +1,9 @@
-/*************************************************
-* PBKDF2 Source File                             *
-* (C) 1999-2007 Jack Lloyd                       *
-*************************************************/
+/*
+* PBKDF2
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #include <botan/pbkdf2.h>
 #include <botan/loadstor.h>
@@ -9,9 +11,9 @@
 
 namespace Botan {
 
-/*************************************************
-* Return a PKCS#5 PBKDF2 derived key             *
-*************************************************/
+/*
+* Return a PKCS#5 PBKDF2 derived key
+*/
 OctetString PKCS5_PBKDF2::derive(u32bit key_len,
                                  const std::string& passphrase,
                                  const byte salt[], u32bit salt_size,
@@ -57,9 +59,9 @@ OctetString PKCS5_PBKDF2::derive(u32bit key_len,
    return key;
    }
 
-/*************************************************
-* Return the name of this type                   *
-*************************************************/
+/*
+* Return the name of this type
+*/
 std::string PKCS5_PBKDF2::name() const
    {
    return "PBKDF2(" + mac->name() + ")";
@@ -70,9 +72,9 @@ S2K* PKCS5_PBKDF2::clone() const
    return new PKCS5_PBKDF2(mac->clone());
    }
 
-/*************************************************
-* PKCS5_PBKDF2 Constructor                       *
-*************************************************/
+/*
+* PKCS5_PBKDF2 Constructor
+*/
 PKCS5_PBKDF2::PKCS5_PBKDF2(MessageAuthenticationCode* m) : mac(m) {}
 
 PKCS5_PBKDF2::~PKCS5_PBKDF2() { delete mac; }
diff --git a/src/s2k/pbkdf2/pbkdf2.h b/src/s2k/pbkdf2/pbkdf2.h
index f9969c0b0..7510338bb 100644
--- a/src/s2k/pbkdf2/pbkdf2.h
+++ b/src/s2k/pbkdf2/pbkdf2.h
@@ -1,7 +1,9 @@
-/*************************************************
-* PBKDF2 Header File                             *
-* (C) 1999-2007 Jack Lloyd                       *
-*************************************************/
+/*
+* PBKDF2
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #ifndef BOTAN_PBKDF2_H__
 #define BOTAN_PBKDF2_H__
-- 
cgit v1.2.3