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

19 files changed, 210 insertions, 172 deletions

diff --git a/src/cert/cvc/asn1_eac_str.cpp b/src/cert/cvc/asn1_eac_str.cpp
index b367df394..a306ffb01 100644
--- a/src/cert/cvc/asn1_eac_str.cpp
+++ b/src/cert/cvc/asn1_eac_str.cpp
@@ -1,8 +1,10 @@
-/*************************************************
-* Simple ASN.1 String Types Source File          *
-* (C) 2007 FlexSecure GmbH                       *
-*     2008 Jack Lloyd                            *
-*************************************************/
+/*
+* Simple ASN.1 String Types
+* (C) 2007 FlexSecure GmbH
+*     2008 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #include <botan/eac_asn_obj.h>
 #include <botan/der_enc.h>
@@ -13,9 +15,9 @@
 
 namespace Botan {
 
-/*************************************************
-* Create an ASN1_EAC_String                      *
-*************************************************/
+/*
+* Create an ASN1_EAC_String
+*/
 ASN1_EAC_String::ASN1_EAC_String(const std::string& str, ASN1_Tag t) : tag(t)
    {
    iso_8859_str = Charset::transcode(str, LOCAL_CHARSET, LATIN1_CHARSET);
@@ -25,42 +27,42 @@ ASN1_EAC_String::ASN1_EAC_String(const std::string& str, ASN1_Tag t) : tag(t)
       }
    }
 
-/*************************************************
-* Return this string in ISO 8859-1 encoding      *
-*************************************************/
+/*
+* Return this string in ISO 8859-1 encoding
+*/
 std::string ASN1_EAC_String::iso_8859() const
    {
    return iso_8859_str;
    }
 
-/*************************************************
-* Return this string in local encoding           *
-*************************************************/
+/*
+* Return this string in local encoding
+*/
 std::string ASN1_EAC_String::value() const
    {
    return Charset::transcode(iso_8859_str, LATIN1_CHARSET, LOCAL_CHARSET);
    }
 
-/*************************************************
-* Return the type of this string object          *
-*************************************************/
+/*
+* Return the type of this string object
+*/
 ASN1_Tag ASN1_EAC_String::tagging() const
    {
    return tag;
    }
 
-/*************************************************
-* DER encode an ASN1_EAC_String                  *
-*************************************************/
+/*
+* DER encode an ASN1_EAC_String
+*/
 void ASN1_EAC_String::encode_into(DER_Encoder& encoder) const
    {
    std::string value = iso_8859();
    encoder.add_object(tagging(), APPLICATION, value);
    }
 
-/*************************************************
-* Decode a BER encoded ASN1_EAC_String           *
-*************************************************/
+/*
+* Decode a BER encoded ASN1_EAC_String
+*/
 void ASN1_EAC_String::decode_from(BER_Decoder& source)
    {
    BER_Object obj = source.get_next_object();
diff --git a/src/cert/cvc/asn1_eac_tm.cpp b/src/cert/cvc/asn1_eac_tm.cpp
index 91688879c..05533b520 100644
--- a/src/cert/cvc/asn1_eac_tm.cpp
+++ b/src/cert/cvc/asn1_eac_tm.cpp
@@ -1,8 +1,10 @@
-/*************************************************
-* EAC Time Types Source File                     *
-* (C) 2007 FlexSecure GmbH                       *
-*     2008 Jack Lloyd                            *
-*************************************************/
+/*
+* EAC Time Types
+* (C) 2007 FlexSecure GmbH
+*     2008 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #include <botan/eac_asn_obj.h>
 #include <botan/der_enc.h>
@@ -16,9 +18,9 @@ namespace Botan {
 
 namespace {
 
-/*************************************************
-* Convert a time_t to a struct tm                *
-*************************************************/
+/*
+* Convert a time_t to a struct tm
+*/
 std::tm get_tm(u64bit timer)
    {
    std::time_t time_val = static_cast<std::time_t>(timer);
@@ -59,9 +61,9 @@ u32bit dec_two_digit(byte b1, byte b2)
    }
 }
 
-/*************************************************
-* Create an EAC_Time                            *
-*************************************************/
+/*
+* Create an EAC_Time
+*/
 EAC_Time::EAC_Time(u64bit timer, ASN1_Tag t)
    :tag(t)
    {
@@ -73,17 +75,17 @@ EAC_Time::EAC_Time(u64bit timer, ASN1_Tag t)
 
    }
 
-/*************************************************
-* Create an EAC_Time                             *
-*************************************************/
+/*
+* Create an EAC_Time
+*/
 EAC_Time::EAC_Time(const std::string& t_spec, ASN1_Tag t)
    :tag(t)
    {
    set_to(t_spec);
    }
-/*************************************************
-* Create an EAC_Time                             *
-*************************************************/
+/*
+* Create an EAC_Time
+*/
 EAC_Time::EAC_Time(u32bit y, u32bit m, u32bit d, ASN1_Tag t)
    : year(y),
      month(m),
@@ -92,9 +94,9 @@ EAC_Time::EAC_Time(u32bit y, u32bit m, u32bit d, ASN1_Tag t)
    {
    }
 
-/*************************************************
-* Set the time with a human readable string      *
-*************************************************/
+/*
+* Set the time with a human readable string
+*/
 void EAC_Time::set_to(const std::string& time_str)
    {
    if (time_str == "")
@@ -132,18 +134,18 @@ void EAC_Time::set_to(const std::string& time_str)
    }
 
 
-/*************************************************
-* DER encode a EAC_Time                         *
-*************************************************/
+/*
+* DER encode a EAC_Time
+*/
 void EAC_Time::encode_into(DER_Encoder& der) const
    {
    der.add_object(tag, APPLICATION,
                   encoded_eac_time());
    }
 
-/*************************************************
-* Return a string representation of the time     *
-*************************************************/
+/*
+* Return a string representation of the time
+*/
 std::string EAC_Time::as_string() const
    {
    if (time_is_set() == false)
@@ -157,17 +159,17 @@ std::string EAC_Time::as_string() const
    return asn1rep;
    }
 
-/*************************************************
-* Return if the time has been set somehow        *
-*************************************************/
+/*
+* Return if the time has been set somehow
+*/
 bool EAC_Time::time_is_set() const
    {
    return (year != 0);
    }
 
-/*************************************************
-* Return a human readable string representation  *
-*************************************************/
+/*
+* Return a human readable string representation
+*/
 std::string EAC_Time::readable_string() const
    {
    if (time_is_set() == false)
@@ -181,9 +183,9 @@ std::string EAC_Time::readable_string() const
    return readable;
    }
 
-/*************************************************
-* Do a general sanity check on the time          *
-*************************************************/
+/*
+* Do a general sanity check on the time
+*/
 bool EAC_Time::passes_sanity_check() const
    {
    if (year < 2000 || year > 2099)
@@ -197,7 +199,7 @@ bool EAC_Time::passes_sanity_check() const
    }
 
 /******************************************
-* modification functions                  *
+* modification functions
 ******************************************/
 
 void EAC_Time::add_years(u32bit years)
@@ -216,9 +218,9 @@ void EAC_Time::add_months(u32bit months)
    }
 
 
-/*************************************************
-* Compare this time against another              *
-*************************************************/
+/*
+* Compare this time against another
+*/
 s32bit EAC_Time::cmp(const EAC_Time& other) const
    {
    if (time_is_set() == false)
@@ -236,9 +238,9 @@ s32bit EAC_Time::cmp(const EAC_Time& other) const
    return SAME_TIME;
    }
 
-/*************************************************
-* Compare two EAC_Times for in various ways     *
-*************************************************/
+/*
+* Compare two EAC_Times for in various ways
+*/
 bool operator==(const EAC_Time& t1, const EAC_Time& t2)
    {
    return (t1.cmp(t2) == 0);
@@ -264,9 +266,9 @@ bool operator<(const EAC_Time& t1, const EAC_Time& t2)
    return (t1.cmp(t2) < 0);
    }
 
-/*************************************************
-* Decode a BER encoded EAC_Time                 *
-*************************************************/
+/*
+* Decode a BER encoded EAC_Time
+*/
 void EAC_Time::decode_from(BER_Decoder& source)
    {
    BER_Object obj = source.get_next_object();
@@ -320,9 +322,9 @@ u32bit EAC_Time::get_day() const
    return day;
    }
 
-/*************************************************
-* make the value an octet string for encoding    *
-*************************************************/
+/*
+* make the value an octet string for encoding
+*/
 SecureVector<byte> EAC_Time::encoded_eac_time() const
    {
    SecureVector<byte> result;
diff --git a/src/cert/cvc/cvc_ado.cpp b/src/cert/cvc/cvc_ado.cpp
index 6ea8d59c2..6e1484e90 100644
--- a/src/cert/cvc/cvc_ado.cpp
+++ b/src/cert/cvc/cvc_ado.cpp
@@ -1,8 +1,10 @@
-/*************************************************
-* CVC Certificate Constructor                    *
-* (C) 2007 FlexSecure GmbH                       *
-*      2008 Jack Lloyd                           *
-*************************************************/
+/*
+* CVC Certificate Constructor
+* (C) 2007 FlexSecure GmbH
+*      2008 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #include <botan/cvc_ado.h>
 #include <fstream>
diff --git a/src/cert/cvc/cvc_ado.h b/src/cert/cvc/cvc_ado.h
index 5b79cacd9..2c4f3ce70 100644
--- a/src/cert/cvc/cvc_ado.h
+++ b/src/cert/cvc/cvc_ado.h
@@ -1,8 +1,10 @@
-/*************************************************
-* EAC1_1 CVC ADO Header File                     *
-* (C) 2008 Falko Strenzke                        *
-*          [email protected]                *
-*************************************************/
+/*
+* EAC1_1 CVC ADO
+* (C) 2008 Falko Strenzke
+*          [email protected]
+*
+* Distributed under the terms of the Botan license
+*/
 
 #ifndef BOTAN_EAC_CVC_ADO_H__
 #define BOTAN_EAC_CVC_ADO_H__
diff --git a/src/cert/cvc/cvc_ca.h b/src/cert/cvc/cvc_ca.h
index b1296cbfb..3ec307bb3 100644
--- a/src/cert/cvc/cvc_ca.h
+++ b/src/cert/cvc/cvc_ca.h
@@ -1,8 +1,10 @@
-/*************************************************
-* EAC1.1 CVC Certificate Authority Header File   *
-* (C) 2007 FlexSecure GmbH                       *
-*     2008 Jack Lloyd                            *
-*************************************************/
+/*
+* EAC1.1 CVC Certificate Authority
+* (C) 2007 FlexSecure GmbH
+*     2008 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #ifndef BOTAN_CVC_CA_H__
 #define BOTAN_CVC_CA_H__
diff --git a/src/cert/cvc/cvc_cert.cpp b/src/cert/cvc/cvc_cert.cpp
index 11539ef1e..71ca0cf16 100644
--- a/src/cert/cvc/cvc_cert.cpp
+++ b/src/cert/cvc/cvc_cert.cpp
@@ -1,6 +1,8 @@
 /*
  (C) 2007 FlexSecure GmbH
      2008 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
 */
 
 #include <botan/cvc_cert.h>
@@ -27,9 +29,9 @@ u32bit EAC1_1_CVC::get_chat_value() const
    return m_chat_val;
    }
 
-/*************************************************
-* Decode the TBSCertificate data                 *
-*************************************************/
+/*
+* Decode the TBSCertificate data
+*/
 void EAC1_1_CVC::force_decode()
    {
    SecureVector<byte> enc_pk;
@@ -73,9 +75,9 @@ void EAC1_1_CVC::force_decode()
 #endif
    }
 
-/*************************************************
-* CVC Certificate Constructor                   *
-*************************************************/
+/*
+* CVC Certificate Constructor
+*/
 EAC1_1_CVC::EAC1_1_CVC(std::tr1::shared_ptr<DataSource>& in)
    {
    init(in);
diff --git a/src/cert/cvc/cvc_cert.h b/src/cert/cvc/cvc_cert.h
index c007a42e8..17671d332 100644
--- a/src/cert/cvc/cvc_cert.h
+++ b/src/cert/cvc/cvc_cert.h
@@ -1,8 +1,10 @@
-/*************************************************
-* EAC1_1 CVC Header File                         *
-* (C) 2008 Falko Strenzke                        *
-*     2008 Jack Lloyd                            *
-*************************************************/
+/*
+* EAC1_1 CVC
+* (C) 2008 Falko Strenzke
+*     2008 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #ifndef BOTAN_CVC_EAC_H__
 #define BOTAN_CVC_EAC_H__
@@ -78,9 +80,9 @@ class BOTAN_DLL EAC1_1_CVC : public EAC1_1_gen_CVC<EAC1_1_CVC>//Signed_Object
        OID m_chat_oid;
     };
 
-/*************************************************
-* Comparison                                     *
-*************************************************/
+/*
+* Comparison
+*/
 inline bool operator!=(EAC1_1_CVC const& lhs, EAC1_1_CVC const& rhs)
    {
    return !(lhs == rhs);
diff --git a/src/cert/cvc/cvc_gen_cert.h b/src/cert/cvc/cvc_gen_cert.h
index ea53f7f0f..4a788026c 100644
--- a/src/cert/cvc/cvc_gen_cert.h
+++ b/src/cert/cvc/cvc_gen_cert.h
@@ -1,8 +1,10 @@
-/*************************************************
-* EAC1_1 general CVC Header File                 *
-* (C) 2008 Falko Strenzke                        *
-*     2008 Jack Lloyd                            *
-*************************************************/
+/*
+* EAC1_1 general CVC
+* (C) 2008 Falko Strenzke
+*     2008 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #ifndef BOTAN_EAC_CVC_GEN_CERT_H__
 #define BOTAN_EAC_CVC_GEN_CERT_H__
diff --git a/src/cert/cvc/cvc_key.h b/src/cert/cvc/cvc_key.h
index e24c42e41..67b6cef17 100644
--- a/src/cert/cvc/cvc_key.h
+++ b/src/cert/cvc/cvc_key.h
@@ -1,9 +1,11 @@
-/*************************************************
-* EAC CVC Public Key Header File                 *
-* (C) 2008 FlexSecure Gmbh                       *
-*          Falko Strenzke                        *
-*          [email protected]                *
-*************************************************/
+/*
+* EAC CVC Public Key
+* (C) 2008 FlexSecure Gmbh
+*          Falko Strenzke
+*          [email protected]
+*
+* Distributed under the terms of the Botan license
+*/
 
 #ifndef BOTAN_EAC1_1_CVC_PUBLIC_KEY_H__
 #define BOTAN_EAC1_1_CVC_PUBLIC_KEY_H__
diff --git a/src/cert/cvc/cvc_req.cpp b/src/cert/cvc/cvc_req.cpp
index 84ea3ba8a..a9a94827c 100644
--- a/src/cert/cvc/cvc_req.cpp
+++ b/src/cert/cvc/cvc_req.cpp
@@ -1,6 +1,8 @@
 /*
   (C) 2007 FlexSecure GmbH
       2008 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
 */
 
 #include <botan/cvc_cert.h>
diff --git a/src/cert/cvc/cvc_req.h b/src/cert/cvc/cvc_req.h
index 484d01f25..8599f539d 100644
--- a/src/cert/cvc/cvc_req.h
+++ b/src/cert/cvc/cvc_req.h
@@ -1,8 +1,10 @@
-/*************************************************
-* EAC1_1 CVC Request Header File                 *
-* (C) 2008 Falko Strenzke                        *
-*          [email protected]                *
-*************************************************/
+/*
+* EAC1_1 CVC Request
+* (C) 2008 Falko Strenzke
+*          [email protected]
+*
+* Distributed under the terms of the Botan license
+*/
 
 #ifndef BOTAN_EAC_CVC_REQ_H__
 #define BOTAN_EAC_CVC_REQ_H__
@@ -48,9 +50,9 @@ class BOTAN_DLL EAC1_1_Req : public EAC1_1_gen_CVC<EAC1_1_Req>
       EAC1_1_Req() {}
    };
 
-/*************************************************
-* Comparison Operator                            *
-*************************************************/
+/*
+* Comparison Operator
+*/
 inline bool operator!=(EAC1_1_Req const& lhs, EAC1_1_Req const& rhs)
    {
    return !(lhs == rhs);
diff --git a/src/cert/cvc/cvc_self.cpp b/src/cert/cvc/cvc_self.cpp
index 8b49d3186..45a584cb3 100644
--- a/src/cert/cvc/cvc_self.cpp
+++ b/src/cert/cvc/cvc_self.cpp
@@ -1,6 +1,8 @@
 /*
   (C) 2007 FlexSecure GmbH
       2008 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
 */
 
 #include <botan/cvc_self.h>
@@ -20,7 +22,7 @@ namespace Botan {
 namespace {
 
 /*******************************
-* cvc CHAT values              *
+* cvc CHAT values
 *******************************/
 enum CHAT_values{
       CVCA = 0xC0,
diff --git a/src/cert/cvc/cvc_self.h b/src/cert/cvc/cvc_self.h
index 735301989..db23547b9 100644
--- a/src/cert/cvc/cvc_self.h
+++ b/src/cert/cvc/cvc_self.h
@@ -1,8 +1,10 @@
-/*************************************************
-* CVC Self-Signed Certificate Header File        *
-* (C) 2007 FlexSecure GmbH                       *
-*     2008 Jack Lloyd                            *
-*************************************************/
+/*
+* CVC Self-Signed Certificate
+* (C) 2007 FlexSecure GmbH
+*     2008 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #ifndef BOTAN_CVC_EAC_SELF_H__
 #define BOTAN_CVC_EAC_SELF_H__
diff --git a/src/cert/cvc/eac_asn_obj.h b/src/cert/cvc/eac_asn_obj.h
index 61a204eff..3e70f6b74 100644
--- a/src/cert/cvc/eac_asn_obj.h
+++ b/src/cert/cvc/eac_asn_obj.h
@@ -1,8 +1,10 @@
-/*************************************************
-* EAC ASN.1 Objects Header File                  *
-* (C) 2007-2008 FlexSecure GmbH                  *
-*     2008 Jack Lloyd                            *
-*************************************************/
+/*
+* EAC ASN.1 Objects
+* (C) 2007-2008 FlexSecure GmbH
+*     2008 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #ifndef BOTAN_EAC_ASN1_OBJ_H__
 #define BOTAN_EAC_ASN1_OBJ_H__
@@ -221,9 +223,9 @@ class BOTAN_DLL ASN1_Chr : public ASN1_EAC_String
       ASN1_Chr(std::string const& str = "");
    };
 
-/*************************************************
-* Comparison Operations                          *
-*************************************************/
+/*
+* Comparison Operations
+*/
 bool operator==(const EAC_Time&, const EAC_Time&);
 bool operator!=(const EAC_Time&, const EAC_Time&);
 bool operator<=(const EAC_Time&, const EAC_Time&);
diff --git a/src/cert/cvc/eac_obj.h b/src/cert/cvc/eac_obj.h
index 72d897700..04afd7e59 100644
--- a/src/cert/cvc/eac_obj.h
+++ b/src/cert/cvc/eac_obj.h
@@ -1,8 +1,10 @@
-/*************************************************
-* EAC1_1 objects Header File                     *
-* (C) 2008 Falko Strenzke                        *
-*          [email protected]                *
-*************************************************/
+/*
+* EAC1_1 objects
+* (C) 2008 Falko Strenzke
+*          [email protected]
+*
+* Distributed under the terms of the Botan license
+*/
 
 #ifndef BOTAN_EAC_OBJ_H__
 #define BOTAN_EAC_OBJ_H__
@@ -23,9 +25,9 @@ namespace Botan {
 
 const std::string eac_cvc_emsa("EMSA1_BSI");
 
-/*************************************************
-* TR03110 v1.1 EAC CV Certificate                *
-*************************************************/
+/*
+* TR03110 v1.1 EAC CV Certificate
+*/
 template<typename Derived> // CRTP is used enable the call sequence:
 class BOTAN_DLL EAC1_1_obj : public EAC_Signed_Object
    {
diff --git a/src/cert/cvc/ecdsa_sig.h b/src/cert/cvc/ecdsa_sig.h
index 720acaedc..15015c76d 100644
--- a/src/cert/cvc/ecdsa_sig.h
+++ b/src/cert/cvc/ecdsa_sig.h
@@ -1,8 +1,10 @@
-/*************************************************
-* ECDSA Header File                              *
-* (C) 2007 Falko Strenzke, FlexSecure GmbH       *
-* (C) 2008 Jack Lloyd                            *
-*************************************************/
+/*
+* ECDSA
+* (C) 2007 Falko Strenzke, FlexSecure GmbH
+* (C) 2008 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #ifndef BOTAN_ECDSA_SIGNATURE_H__
 #define BOTAN_ECDSA_SIGNATURE_H__
diff --git a/src/cert/cvc/freestore.h b/src/cert/cvc/freestore.h
index e33c0f094..f95afa802 100644
--- a/src/cert/cvc/freestore.h
+++ b/src/cert/cvc/freestore.h
@@ -1,7 +1,7 @@
-/**************************************************
-* (C) 2007 Christoph Ludwig                       *
-*          [email protected]                     *
-**************************************************/
+/**
+* (C) 2007 Christoph Ludwig
+*          [email protected]
+**/
 
 #ifndef BOTAN_FREESTORE_H__
 #define BOTAN_FREESTORE_H__
@@ -23,6 +23,8 @@ namespace Botan {
 * enables convenient automatic conversions between plain and smart
 * pointer types. It internally stores a SharedPointer which can be
 * accessed.
+*
+* Distributed under the terms of the Botan license
 */
 template<typename T>
 class BOTAN_DLL SharedPtrConverter
diff --git a/src/cert/cvc/signed_obj.cpp b/src/cert/cvc/signed_obj.cpp
index 73ae6b917..4a08ed0ac 100644
--- a/src/cert/cvc/signed_obj.cpp
+++ b/src/cert/cvc/signed_obj.cpp
@@ -1,16 +1,18 @@
-/*************************************************
-* X.509 SIGNED Object Source File                *
-* (C) 1999-2007 Jack Lloyd                       *
-*     2007 FlexSecure GmbH                       *
-*************************************************/
+/*
+* X.509 SIGNED Object
+* (C) 1999-2007 Jack Lloyd
+*     2007 FlexSecure GmbH
+*
+* Distributed under the terms of the Botan license
+*/
 
 #include <botan/signed_obj.h>
 
 namespace Botan {
 
-/*************************************************
-* Return a BER encoded X.509 object              *
-*************************************************/
+/*
+* Return a BER encoded X.509 object
+*/
 SecureVector<byte> EAC_Signed_Object::BER_encode() const
    {
    Pipe ber;
@@ -20,9 +22,9 @@ SecureVector<byte> EAC_Signed_Object::BER_encode() const
    return ber.read_all();
    }
 
-/*************************************************
-* Return a PEM encoded X.509 object              *
-*************************************************/
+/*
+* Return a PEM encoded X.509 object
+*/
 std::string EAC_Signed_Object::PEM_encode() const
    {
    Pipe pem;
@@ -32,17 +34,17 @@ std::string EAC_Signed_Object::PEM_encode() const
    return pem.read_all_as_string();
    }
 
-/*************************************************
-* Return the algorithm used to sign this object  *
-*************************************************/
+/*
+* Return the algorithm used to sign this object
+*/
 AlgorithmIdentifier EAC_Signed_Object::signature_algorithm() const
    {
    return sig_algo;
    }
 
-/*************************************************
-* Try to decode the actual information           *
-*************************************************/
+/*
+* Try to decode the actual information
+*/
 void EAC_Signed_Object::do_decode()
    {
    try {
diff --git a/src/cert/cvc/signed_obj.h b/src/cert/cvc/signed_obj.h
index 918a20db5..3c233d21b 100644
--- a/src/cert/cvc/signed_obj.h
+++ b/src/cert/cvc/signed_obj.h
@@ -1,8 +1,10 @@
-/*************************************************
-* EAC SIGNED Object Header File                  *
-* (C) 2007 FlexSecure GmbH                       *
-*     2008 Jack Lloyd                            *
-*************************************************/
+/*
+* EAC SIGNED Object
+* (C) 2007 FlexSecure GmbH
+*     2008 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
 
 #ifndef BOTAN_EAC_SIGNED_OBJECT_H__
 #define BOTAN_EAC_SIGNED_OBJECT_H__