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).

3 files changed, 36 insertions, 30 deletions

diff --git a/src/block/blowfish/blfs_tab.cpp b/src/block/blowfish/blfs_tab.cpp
index f8fa07ee5..070fa6c69 100644
--- a/src/block/blowfish/blfs_tab.cpp
+++ b/src/block/blowfish/blfs_tab.cpp
@@ -1,7 +1,9 @@
-/*************************************************
-* S-Box and P-Box Tables for Blowfish            *
-* (C) 1999-2007 Jack Lloyd                       *
-*************************************************/
+/*
+* S-Box and P-Box Tables for Blowfish
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #include <botan/blowfish.h>
 
diff --git a/src/block/blowfish/blowfish.cpp b/src/block/blowfish/blowfish.cpp
index f55cffb62..b0599d6c5 100644
--- a/src/block/blowfish/blowfish.cpp
+++ b/src/block/blowfish/blowfish.cpp
@@ -1,16 +1,18 @@
-/*************************************************
-* Blowfish Source File                           *
-* (C) 1999-2007 Jack Lloyd                       *
-*************************************************/
+/*
+* Blowfish
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #include <botan/blowfish.h>
 #include <botan/loadstor.h>
 
 namespace Botan {
 
-/*************************************************
-* Blowfish Encryption                            *
-*************************************************/
+/*
+* Blowfish Encryption
+*/
 void Blowfish::enc(const byte in[], byte out[]) const
    {
    const u32bit* S1 = S + 0;
@@ -37,9 +39,9 @@ void Blowfish::enc(const byte in[], byte out[]) const
    store_be(out, R, L);
    }
 
-/*************************************************
-* Blowfish Decryption                            *
-*************************************************/
+/*
+* Blowfish Decryption
+*/
 void Blowfish::dec(const byte in[], byte out[]) const
    {
    const u32bit* S1 = S + 0;
@@ -66,9 +68,9 @@ void Blowfish::dec(const byte in[], byte out[]) const
    store_be(out, R, L);
    }
 
-/*************************************************
-* Blowfish Key Schedule                          *
-*************************************************/
+/*
+* Blowfish Key Schedule
+*/
 void Blowfish::key_schedule(const byte key[], u32bit length)
    {
    clear();
@@ -82,9 +84,9 @@ void Blowfish::key_schedule(const byte key[], u32bit length)
    generate_sbox(S, 1024, L, R);
    }
 
-/*************************************************
-* Generate one of the Sboxes                     *
-*************************************************/
+/*
+* Generate one of the Sboxes
+*/
 void Blowfish::generate_sbox(u32bit Box[], u32bit size,
                              u32bit& L, u32bit& R) const
    {
@@ -111,9 +113,9 @@ void Blowfish::generate_sbox(u32bit Box[], u32bit size,
       }
    }
 
-/*************************************************
-* Clear memory of sensitive data                 *
-*************************************************/
+/*
+* Clear memory of sensitive data
+*/
 void Blowfish::clear() throw()
    {
    P.copy(P_INIT, 18);
diff --git a/src/block/blowfish/blowfish.h b/src/block/blowfish/blowfish.h
index c4ef16683..f0f26418d 100644
--- a/src/block/blowfish/blowfish.h
+++ b/src/block/blowfish/blowfish.h
@@ -1,7 +1,9 @@
-/*************************************************
-* Blowfish Header File                           *
-* (C) 1999-2008 Jack Lloyd                       *
-*************************************************/
+/*
+* Blowfish
+* (C) 1999-2008 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #ifndef BOTAN_BLOWFISH_H__
 #define BOTAN_BLOWFISH_H__
@@ -10,9 +12,9 @@
 
 namespace Botan {
 
-/*************************************************
-* Blowfish                                       *
-*************************************************/
+/*
+* Blowfish
+*/
 class BOTAN_DLL Blowfish : public BlockCipher
    {
    public: