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

2 files changed, 27 insertions, 23 deletions

diff --git a/src/pk_pad/eme1/eme1.cpp b/src/pk_pad/eme1/eme1.cpp
index e5db17df6..13f68f8e4 100644
--- a/src/pk_pad/eme1/eme1.cpp
+++ b/src/pk_pad/eme1/eme1.cpp
@@ -1,7 +1,9 @@
-/*************************************************
-* EME1 Source File                               *
-* (C) 1999-2007 Jack Lloyd                       *
-*************************************************/
+/*
+* EME1
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #include <botan/eme1.h>
 #include <botan/mgf1.h>
@@ -9,9 +11,9 @@
 
 namespace Botan {
 
-/*************************************************
-* EME1 Pad Operation                             *
-*************************************************/
+/*
+* EME1 Pad Operation
+*/
 SecureVector<byte> EME1::pad(const byte in[], u32bit in_length,
                              u32bit key_length,
                              RandomNumberGenerator& rng) const
@@ -36,9 +38,9 @@ SecureVector<byte> EME1::pad(const byte in[], u32bit in_length,
    return out;
    }
 
-/*************************************************
-* EME1 Unpad Operation                           *
-*************************************************/
+/*
+* EME1 Unpad Operation
+*/
 SecureVector<byte> EME1::unpad(const byte in[], u32bit in_length,
                                u32bit key_length) const
    {
@@ -77,9 +79,9 @@ SecureVector<byte> EME1::unpad(const byte in[], u32bit in_length,
    throw Decoding_Error("Invalid EME1 encoding");
    }
 
-/*************************************************
-* Return the max input size for a given key size *
-*************************************************/
+/*
+* Return the max input size for a given key size
+*/
 u32bit EME1::maximum_input_size(u32bit keybits) const
    {
    if(keybits / 8 > 2*HASH_LENGTH + 1)
@@ -88,9 +90,9 @@ u32bit EME1::maximum_input_size(u32bit keybits) const
       return 0;
    }
 
-/*************************************************
-* EME1 Constructor                               *
-*************************************************/
+/*
+* EME1 Constructor
+*/
 EME1::EME1(HashFunction* hash, const std::string& P) :
    HASH_LENGTH(hash->OUTPUT_LENGTH)
    {
diff --git a/src/pk_pad/eme1/eme1.h b/src/pk_pad/eme1/eme1.h
index a0676b7df..4df5c5f1c 100644
--- a/src/pk_pad/eme1/eme1.h
+++ b/src/pk_pad/eme1/eme1.h
@@ -1,7 +1,9 @@
-/*************************************************
-* EME1 Header File                               *
-* (C) 1999-2007 Jack Lloyd                       *
-*************************************************/
+/*
+* EME1
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #ifndef BOTAN_EME1_H__
 #define BOTAN_EME1_H__
@@ -12,9 +14,9 @@
 
 namespace Botan {
 
-/*************************************************
-* EME1                                           *
-*************************************************/
+/*
+* EME1
+*/
 class BOTAN_DLL EME1 : public EME
    {
    public: