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

10 files changed, 46 insertions, 26 deletions

diff --git a/src/rng/auto_rng/auto_rng.cpp b/src/rng/auto_rng/auto_rng.cpp
index 620cc1f61..578047afc 100644
--- a/src/rng/auto_rng/auto_rng.cpp
+++ b/src/rng/auto_rng/auto_rng.cpp
@@ -1,7 +1,9 @@
-/*************************************************
-* Auto Seeded RNG Source File                    *
-* (C) 2008 Jack Lloyd                            *
-*************************************************/
+/*
+* Auto Seeded RNG
+* (C) 2008 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #include <botan/auto_rng.h>
 #include <botan/parsing.h>
diff --git a/src/rng/auto_rng/auto_rng.h b/src/rng/auto_rng/auto_rng.h
index 5536f2b8e..021c724fb 100644
--- a/src/rng/auto_rng/auto_rng.h
+++ b/src/rng/auto_rng/auto_rng.h
@@ -1,7 +1,9 @@
-/*************************************************
-* Auto Seeded RNG Header File                    *
-* (C) 2008 Jack Lloyd                            *
-*************************************************/
+/*
+* Auto Seeded RNG
+* (C) 2008 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #ifndef BOTAN_AUTO_SEEDING_RNG_H__
 #define BOTAN_AUTO_SEEDING_RNG_H__
diff --git a/src/rng/hmac_rng/hmac_rng.cpp b/src/rng/hmac_rng/hmac_rng.cpp
index 458118e11..2f152bf4d 100644
--- a/src/rng/hmac_rng/hmac_rng.cpp
+++ b/src/rng/hmac_rng/hmac_rng.cpp
@@ -1,6 +1,8 @@
 /*
 * HMAC_RNG
 * (C) 2008-2009 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
 */
 
 #include <botan/hmac_rng.h>
diff --git a/src/rng/hmac_rng/hmac_rng.h b/src/rng/hmac_rng/hmac_rng.h
index 16adddd60..318e2a931 100644
--- a/src/rng/hmac_rng/hmac_rng.h
+++ b/src/rng/hmac_rng/hmac_rng.h
@@ -1,6 +1,8 @@
 /*
 * HMAC RNG
 * (C) 2008 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
 */
 
 #ifndef BOTAN_HMAC_RNG_H__
diff --git a/src/rng/randpool/randpool.cpp b/src/rng/randpool/randpool.cpp
index af36c335f..f9e05c246 100644
--- a/src/rng/randpool/randpool.cpp
+++ b/src/rng/randpool/randpool.cpp
@@ -1,6 +1,8 @@
 /*
-* Randpool Source File
+* Randpool
 * (C) 1999-2009 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
 */
 
 #include <botan/randpool.h>
diff --git a/src/rng/randpool/randpool.h b/src/rng/randpool/randpool.h
index f44527609..b6a3adda4 100644
--- a/src/rng/randpool/randpool.h
+++ b/src/rng/randpool/randpool.h
@@ -1,6 +1,8 @@
 /*
-* Randpool Header File
+* Randpool
 * (C) 1999-2008 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
 */
 
 #ifndef BOTAN_RANDPOOL_H__
diff --git a/src/rng/rng.cpp b/src/rng/rng.cpp
index fe3c4e10c..aa9b73ff3 100644
--- a/src/rng/rng.cpp
+++ b/src/rng/rng.cpp
@@ -1,7 +1,9 @@
-/*************************************************
-* Random Number Generator Base Source File       *
-* (C) 1999-2008 Jack Lloyd                       *
-*************************************************/
+/*
+* Random Number Generator Base
+* (C) 1999-2008 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #include <botan/rng.h>
 
@@ -11,9 +13,9 @@
 
 namespace Botan {
 
-/*************************************************
-* Get a single random byte                       *
-*************************************************/
+/*
+* Get a single random byte
+*/
 byte RandomNumberGenerator::next_byte()
    {
    byte out;
@@ -21,9 +23,9 @@ byte RandomNumberGenerator::next_byte()
    return out;
    }
 
-/*************************************************
-* Create and seed a new RNG object               *
-*************************************************/
+/*
+* Create and seed a new RNG object
+*/
 RandomNumberGenerator* RandomNumberGenerator::make_rng()
    {
 #if defined(BOTAN_HAS_AUTO_SEEDING_RNG)
diff --git a/src/rng/rng.h b/src/rng/rng.h
index 7fc6ee439..41904dbef 100644
--- a/src/rng/rng.h
+++ b/src/rng/rng.h
@@ -1,6 +1,8 @@
 /*
-* RandomNumberGenerator Header File
+* RandomNumberGenerator
 * (C) 1999-2009 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
 */
 
 #ifndef BOTAN_RANDOM_NUMBER_GENERATOR_H__
@@ -80,9 +82,9 @@ class BOTAN_DLL RandomNumberGenerator
          { return (*this); }
    };
 
-/*************************************************
-* Null Random Number Generator                   *
-*************************************************/
+/*
+* Null Random Number Generator
+*/
 class BOTAN_DLL Null_RNG : public RandomNumberGenerator
    {
    public:
diff --git a/src/rng/x931_rng/x931_rng.cpp b/src/rng/x931_rng/x931_rng.cpp
index e77f04ae4..e239bce84 100644
--- a/src/rng/x931_rng/x931_rng.cpp
+++ b/src/rng/x931_rng/x931_rng.cpp
@@ -1,6 +1,8 @@
 /*
-* ANSI X9.31 RNG Source File
+* ANSI X9.31 RNG
 * (C) 1999-2009 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
 */
 
 #include <botan/x931_rng.h>
diff --git a/src/rng/x931_rng/x931_rng.h b/src/rng/x931_rng/x931_rng.h
index b1cef8df3..44e9b4428 100644
--- a/src/rng/x931_rng/x931_rng.h
+++ b/src/rng/x931_rng/x931_rng.h
@@ -1,6 +1,8 @@
 /*
-* ANSI X9.31 RNG Header File
+* ANSI X9.31 RNG
 * (C) 1999-2009 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
 */
 
 #ifndef BOTAN_ANSI_X931_RNG_H__