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

8 files changed, 90 insertions, 74 deletions

diff --git a/src/engine/def_engine/def_eng.h b/src/engine/def_engine/def_eng.h
index 0cdf7ffb4..2d7145480 100644
--- a/src/engine/def_engine/def_eng.h
+++ b/src/engine/def_engine/def_eng.h
@@ -1,7 +1,9 @@
-/*************************************************
-* Default Engine Header File                     *
-* (C) 1999-2007 Jack Lloyd                       *
-*************************************************/
+/*
+* Default Engine
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #ifndef BOTAN_DEFAULT_ENGINE_H__
 #define BOTAN_DEFAULT_ENGINE_H__
@@ -10,9 +12,9 @@
 
 namespace Botan {
 
-/*************************************************
-* Default Engine                                 *
-*************************************************/
+/*
+* Default Engine
+*/
 class BOTAN_DLL Default_Engine : public Engine
    {
    public:
diff --git a/src/engine/def_engine/def_mode.cpp b/src/engine/def_engine/def_mode.cpp
index a2594c13f..a61683f93 100644
--- a/src/engine/def_engine/def_mode.cpp
+++ b/src/engine/def_engine/def_mode.cpp
@@ -1,7 +1,9 @@
-/*************************************************
-* Default Engine Source File                     *
-* (C) 1999-2007 Jack Lloyd                       *
-*************************************************/
+/*
+* Default Engine
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #include <botan/def_eng.h>
 #include <botan/parsing.h>
@@ -68,9 +70,9 @@ BlockCipherModePaddingMethod* get_bc_pad(const std::string& algo_spec)
 
 }
 
-/*************************************************
-* Get a cipher object                            *
-*************************************************/
+/*
+* Get a cipher object
+*/
 Keyed_Filter* Default_Engine::get_cipher(const std::string& algo_spec,
                                          Cipher_Dir direction,
                                          Algorithm_Factory& af)
diff --git a/src/engine/def_engine/def_pk_ops.cpp b/src/engine/def_engine/def_pk_ops.cpp
index 5e29e110f..31dce7a74 100644
--- a/src/engine/def_engine/def_pk_ops.cpp
+++ b/src/engine/def_engine/def_pk_ops.cpp
@@ -1,7 +1,9 @@
-/*************************************************
-* PK Operations Source File                      *
-* (C) 1999-2007 Jack Lloyd                       *
-*************************************************/
+/*
+* PK Operations
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #include <botan/def_eng.h>
 
@@ -36,9 +38,9 @@
 namespace Botan {
 
 #if defined(BOTAN_HAS_IF_PUBLIC_KEY_FAMILY)
-/*************************************************
-* Acquire an IF op                               *
-*************************************************/
+/*
+* Acquire an IF op
+*/
 IF_Operation* Default_Engine::if_op(const BigInt& e, const BigInt& n,
                                     const BigInt& d, const BigInt& p,
                                     const BigInt& q, const BigInt& d1,
@@ -49,9 +51,9 @@ IF_Operation* Default_Engine::if_op(const BigInt& e, const BigInt& n,
 #endif
 
 #if defined(BOTAN_HAS_DSA)
-/*************************************************
-* Acquire a DSA op                               *
-*************************************************/
+/*
+* Acquire a DSA op
+*/
 DSA_Operation* Default_Engine::dsa_op(const DL_Group& group, const BigInt& y,
                                       const BigInt& x) const
    {
@@ -60,9 +62,9 @@ DSA_Operation* Default_Engine::dsa_op(const DL_Group& group, const BigInt& y,
 #endif
 
 #if defined(BOTAN_HAS_NYBERG_RUEPPEL)
-/*************************************************
-* Acquire a NR op                                *
-*************************************************/
+/*
+* Acquire a NR op
+*/
 NR_Operation* Default_Engine::nr_op(const DL_Group& group, const BigInt& y,
                                     const BigInt& x) const
    {
@@ -71,9 +73,9 @@ NR_Operation* Default_Engine::nr_op(const DL_Group& group, const BigInt& y,
 #endif
 
 #if defined(BOTAN_HAS_ELGAMAL)
-/*************************************************
-* Acquire an ElGamal op                          *
-*************************************************/
+/*
+* Acquire an ElGamal op
+*/
 ELG_Operation* Default_Engine::elg_op(const DL_Group& group, const BigInt& y,
                                       const BigInt& x) const
    {
@@ -82,9 +84,9 @@ ELG_Operation* Default_Engine::elg_op(const DL_Group& group, const BigInt& y,
 #endif
 
 #if defined(BOTAN_HAS_DIFFIE_HELLMAN)
-/*************************************************
-* Acquire a DH op                                *
-*************************************************/
+/*
+* Acquire a DH op
+*/
 DH_Operation* Default_Engine::dh_op(const DL_Group& group,
                                     const BigInt& x) const
    {
@@ -93,9 +95,9 @@ DH_Operation* Default_Engine::dh_op(const DL_Group& group,
 #endif
 
 #if defined(BOTAN_HAS_ECDSA)
-/*************************************************
-* Acquire a ECDSA op                             *
-*************************************************/
+/*
+* Acquire a ECDSA op
+*/
 ECDSA_Operation* Default_Engine::ecdsa_op(const EC_Domain_Params& dom_pars,
                                           const BigInt& priv_key,
                                           const PointGFp& pub_key) const
@@ -105,9 +107,9 @@ ECDSA_Operation* Default_Engine::ecdsa_op(const EC_Domain_Params& dom_pars,
 #endif
 
 #if defined(BOTAN_HAS_ECKAEG)
-/*************************************************
-* Acquire a ECKAEG op                            *
-*************************************************/
+/*
+* Acquire a ECKAEG op
+*/
 ECKAEG_Operation* Default_Engine::eckaeg_op(const EC_Domain_Params& dom_pars,
                                             const BigInt& priv_key,
                                             const PointGFp& pub_key) const
diff --git a/src/engine/def_engine/def_powm.cpp b/src/engine/def_engine/def_powm.cpp
index 38aca901c..9e7a88a1a 100644
--- a/src/engine/def_engine/def_powm.cpp
+++ b/src/engine/def_engine/def_powm.cpp
@@ -1,16 +1,18 @@
-/*************************************************
-* Modular Exponentiation Source File             *
-* (C) 1999-2007 Jack Lloyd                       *
-*************************************************/
+/*
+* Modular Exponentiation
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #include <botan/def_eng.h>
 #include <botan/def_powm.h>
 
 namespace Botan {
 
-/*************************************************
-* Choose a modular exponentation algorithm       *
-*************************************************/
+/*
+* Choose a modular exponentation algorithm
+*/
 Modular_Exponentiator*
 Default_Engine::mod_exp(const BigInt& n, Power_Mod::Usage_Hints hints) const
    {
diff --git a/src/engine/def_engine/lookup_block.cpp b/src/engine/def_engine/lookup_block.cpp
index 06383357b..14c8da8a7 100644
--- a/src/engine/def_engine/lookup_block.cpp
+++ b/src/engine/def_engine/lookup_block.cpp
@@ -1,7 +1,9 @@
-/*************************************************
-* Block Cipher Lookup                            *
-* (C) 1999-2007 Jack Lloyd                       *
-*************************************************/
+/*
+* Block Cipher Lookup
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #include <botan/def_eng.h>
 #include <botan/scan_name.h>
@@ -103,9 +105,9 @@
 
 namespace Botan {
 
-/*************************************************
-* Look for an algorithm with this name           *
-*************************************************/
+/*
+* Look for an algorithm with this name
+*/
 BlockCipher*
 Default_Engine::find_block_cipher(const SCAN_Name& request,
                                   Algorithm_Factory& af) const
diff --git a/src/engine/def_engine/lookup_hash.cpp b/src/engine/def_engine/lookup_hash.cpp
index 48ed8bc04..6a0d42dee 100644
--- a/src/engine/def_engine/lookup_hash.cpp
+++ b/src/engine/def_engine/lookup_hash.cpp
@@ -1,7 +1,9 @@
-/*************************************************
-* Hash Algorithms Lookup                         *
-* (C) 1999-2007 Jack Lloyd                       *
-*************************************************/
+/*
+* Hash Algorithms Lookup
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #include <botan/def_eng.h>
 #include <botan/scan_name.h>
@@ -71,9 +73,9 @@
 
 namespace Botan {
 
-/*************************************************
-* Look for an algorithm with this name           *
-*************************************************/
+/*
+* Look for an algorithm with this name
+*/
 HashFunction*
 Default_Engine::find_hash(const SCAN_Name& request,
                           Algorithm_Factory& af) const
diff --git a/src/engine/def_engine/lookup_mac.cpp b/src/engine/def_engine/lookup_mac.cpp
index 35f17e134..3fef12b59 100644
--- a/src/engine/def_engine/lookup_mac.cpp
+++ b/src/engine/def_engine/lookup_mac.cpp
@@ -1,7 +1,9 @@
-/*************************************************
-* MAC Lookup                                     *
-* (C) 1999-2007 Jack Lloyd                       *
-*************************************************/
+/*
+* MAC Lookup
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #include <botan/def_eng.h>
 #include <botan/scan_name.h>
@@ -29,9 +31,9 @@
 
 namespace Botan {
 
-/*************************************************
-* Look for an algorithm with this name           *
-*************************************************/
+/*
+* Look for an algorithm with this name
+*/
 MessageAuthenticationCode*
 Default_Engine::find_mac(const SCAN_Name& request,
                          Algorithm_Factory& af) const
diff --git a/src/engine/def_engine/lookup_stream.cpp b/src/engine/def_engine/lookup_stream.cpp
index e7f1ff41d..e2f1b32b8 100644
--- a/src/engine/def_engine/lookup_stream.cpp
+++ b/src/engine/def_engine/lookup_stream.cpp
@@ -1,7 +1,9 @@
-/*************************************************
-* Stream Cipher Lookup                           *
-* (C) 1999-2007 Jack Lloyd                       *
-*************************************************/
+/*
+* Stream Cipher Lookup
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #include <botan/def_eng.h>
 #include <botan/scan_name.h>
@@ -24,9 +26,9 @@
 
 namespace Botan {
 
-/*************************************************
-* Look for an algorithm with this name           *
-*************************************************/
+/*
+* Look for an algorithm with this name
+*/
 StreamCipher*
 Default_Engine::find_stream_cipher(const SCAN_Name& request,
                                    Algorithm_Factory&) const