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/codec/openpgp/openpgp.cpp b/src/codec/openpgp/openpgp.cpp
index 25eb15ec5..7f9cf5f9c 100644
--- a/src/codec/openpgp/openpgp.cpp
+++ b/src/codec/openpgp/openpgp.cpp
@@ -1,7 +1,9 @@
-/*************************************************
-* OpenPGP Source File                            *
-* (C) 1999-2007 Jack Lloyd                       *
-*************************************************/
+/*
+* OpenPGP
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #include <botan/openpgp.h>
 #include <botan/filters.h>
@@ -12,9 +14,9 @@ namespace Botan {
 
 namespace OpenPGP {
 
-/*************************************************
-* OpenPGP Base64 encoding                        *
-*************************************************/
+/*
+* OpenPGP Base64 encoding
+*/
 std::string encode(const byte input[], u32bit length,
                    const std::string& label,
                    const std::map<std::string, std::string>& headers)
@@ -52,9 +54,9 @@ std::string encode(const byte input[], u32bit length,
    return pgp_encoded;
    }
 
-/*************************************************
-* OpenPGP Base64 encoding                        *
-*************************************************/
+/*
+* OpenPGP Base64 encoding
+*/
 std::string encode(const byte input[], u32bit length,
                    const std::string& type)
    {
@@ -62,9 +64,9 @@ std::string encode(const byte input[], u32bit length,
    return encode(input, length, type, empty);
    }
 
-/*************************************************
-* OpenPGP Base64 decoding                        *
-*************************************************/
+/*
+* OpenPGP Base64 decoding
+*/
 SecureVector<byte> decode(DataSource& source, std::string& label,
                           std::map<std::string, std::string>& headers)
    {
@@ -180,9 +182,9 @@ SecureVector<byte> decode(DataSource& source, std::string& label,
    return base64.read_all();
    }
 
-/*************************************************
-* OpenPGP Base64 decoding                        *
-*************************************************/
+/*
+* OpenPGP Base64 decoding
+*/
 SecureVector<byte> decode(DataSource& source, std::string& label)
    {
    std::map<std::string, std::string> ignored;
diff --git a/src/codec/openpgp/openpgp.h b/src/codec/openpgp/openpgp.h
index 1a078a630..890fcf0e3 100644
--- a/src/codec/openpgp/openpgp.h
+++ b/src/codec/openpgp/openpgp.h
@@ -1,7 +1,9 @@
-/*************************************************
-* OpenPGP Header File                            *
-* (C) 1999-2007 Jack Lloyd                       *
-*************************************************/
+/*
+* OpenPGP
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #ifndef BOTAN_OPENPGP_H__
 #define BOTAN_OPENPGP_H__
@@ -14,9 +16,9 @@ namespace Botan {
 
 namespace OpenPGP {
 
-/*************************************************
-* OpenPGP Base64 encoding/decoding               *
-*************************************************/
+/*
+* OpenPGP Base64 encoding/decoding
+*/
 BOTAN_DLL std::string encode(const byte[], u32bit, const std::string&,
                                   const std::map<std::string, std::string>&);
 BOTAN_DLL SecureVector<byte> decode(DataSource&, std::string&,