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

1 files changed, 18 insertions, 16 deletions

diff --git a/src/cms/cms_algo.cpp b/src/cms/cms_algo.cpp
index 8db27c65f..748aa73da 100644
--- a/src/cms/cms_algo.cpp
+++ b/src/cms/cms_algo.cpp
@@ -1,7 +1,9 @@
-/*************************************************
-* CMS Algorithm Specific Code Source File        *
-* (C) 1999-2007 Jack Lloyd                       *
-*************************************************/
+/*
+* CMS Algorithm Specific Code
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #include <botan/cms_enc.h>
 #include <botan/der_enc.h>
@@ -18,9 +20,9 @@ namespace Botan {
 
 namespace {
 
-/*************************************************
-* Wrap a key as specified in RFC 3217            *
-*************************************************/
+/*
+* Wrap a key as specified in RFC 3217
+*/
 SecureVector<byte> do_rfc3217_wrap(RandomNumberGenerator& rng,
                                    const std::string& cipher_name,
                                    const SymmetricKey& kek,
@@ -70,9 +72,9 @@ SecureVector<byte> do_rfc3217_wrap(RandomNumberGenerator& rng,
 
 }
 
-/*************************************************
-* Wrap a CEK with a KEK                          *
-*************************************************/
+/*
+* Wrap a CEK with a KEK
+*/
 SecureVector<byte> CMS_Encoder::wrap_key(RandomNumberGenerator& rng,
                                          const std::string& cipher,
                                          const SymmetricKey& cek,
@@ -105,9 +107,9 @@ SecureVector<byte> CMS_Encoder::wrap_key(RandomNumberGenerator& rng,
    throw Invalid_Argument("CMS_Encoder::wrap: Unknown cipher " + cipher);
    }
 
-/*************************************************
-* Encode the parameters for an encryption algo   *
-*************************************************/
+/*
+* Encode the parameters for an encryption algo
+*/
 SecureVector<byte> CMS_Encoder::encode_params(const std::string& cipher,
                                               const SymmetricKey& key,
                                               const InitializationVector& iv)
@@ -138,9 +140,9 @@ SecureVector<byte> CMS_Encoder::encode_params(const std::string& cipher,
    return encoder.get_contents();
    }
 
-/*************************************************
-* Generate a CEK or KEK for the cipher           *
-*************************************************/
+/*
+* Generate a CEK or KEK for the cipher
+*/
 SymmetricKey CMS_Encoder::setup_key(RandomNumberGenerator& rng,
                                     const std::string& cipher)
    {