Cleanups - remove emails from source files, they should only live in

credits.txt and thanks.txt. Remove some various bits of formatting weirdness.

19 files changed, 39 insertions, 62 deletions

diff --git a/doc/thanks.txt b/doc/thanks.txt
index caa2fb538..def96a16a 100644
--- a/doc/thanks.txt
+++ b/doc/thanks.txt
@@ -23,9 +23,10 @@ has provided financial assistance to the project.
 Barry Kavanagh of AEP Systems Ltd kindly provided an AEP2000 crypto card and
 drivers, enabling the creation of Botan's AEP engine module.
 
-In addition, the following people have unknowingly contributed help:
+In addition, the following people have unknowingly contributed help
+via public domain code which has been repurposed into the library:
 
-  Dean Gaudet <[email protected]> wrote the SSE2 implementation of SHA-1
+  Dean Gaudet wrote the SSE2 implementation of SHA-1
 
   The implementation of DES is based off a public domain implementation by Phil
   Karn from 1994 (he, in turn, credits Richard Outerbridge and Jim Gillogly).
@@ -42,7 +43,7 @@ In addition, the following people have unknowingly contributed help:
   Some of the hash functions (MD5, SHA-1, etc) use an optimized implementation
   of one of the boolean functions, which was discovered by Colin Plumb.
 
-  The design of Randpool takes some of it's design principles from those
+  The design of Randpool takes some of its design principles from those
   suggested by Eric A. Young in his SSLeay documentation, Peter Gutmann's paper
   "Software Generation of Practically Strong Random Numbers", and the paper
   "Cryptanalytic Attacks on Pseudorandom Number Generators", by Kelsey,
diff --git a/src/block/serpent_ia32/serp_ia32_imp.S b/src/block/serpent_ia32/serp_ia32_imp.S
index 9e50f8cdc..5ab630f43 100644
--- a/src/block/serpent_ia32/serp_ia32_imp.S
+++ b/src/block/serpent_ia32/serp_ia32_imp.S
@@ -1,5 +1,5 @@
 /*
-* Serpent Source File
+* Serpent in IA-32 assembler
 * (C) 1999-2007 Jack Lloyd
 *
 * Distributed under the terms of the Botan license
diff --git a/src/cert/cvc/cvc_ado.h b/src/cert/cvc/cvc_ado.h
index 2c4f3ce70..a0dbec2a6 100644
--- a/src/cert/cvc/cvc_ado.h
+++ b/src/cert/cvc/cvc_ado.h
@@ -1,7 +1,6 @@
 /*
 * EAC1_1 CVC ADO
 * (C) 2008 Falko Strenzke
-*          [email protected]
 *
 * Distributed under the terms of the Botan license
 */
diff --git a/src/cert/cvc/cvc_key.h b/src/cert/cvc/cvc_key.h
index 67b6cef17..a81660597 100644
--- a/src/cert/cvc/cvc_key.h
+++ b/src/cert/cvc/cvc_key.h
@@ -2,7 +2,6 @@
 * EAC CVC Public Key
 * (C) 2008 FlexSecure Gmbh
 *          Falko Strenzke
-*          [email protected]
 *
 * Distributed under the terms of the Botan license
 */
diff --git a/src/cert/cvc/cvc_req.h b/src/cert/cvc/cvc_req.h
index 8599f539d..28f03db80 100644
--- a/src/cert/cvc/cvc_req.h
+++ b/src/cert/cvc/cvc_req.h
@@ -1,7 +1,6 @@
 /*
 * EAC1_1 CVC Request
 * (C) 2008 Falko Strenzke
-*          [email protected]
 *
 * Distributed under the terms of the Botan license
 */
diff --git a/src/cert/cvc/eac_obj.h b/src/cert/cvc/eac_obj.h
index 04afd7e59..2c1250a9a 100644
--- a/src/cert/cvc/eac_obj.h
+++ b/src/cert/cvc/eac_obj.h
@@ -1,7 +1,6 @@
 /*
 * EAC1_1 objects
 * (C) 2008 Falko Strenzke
-*          [email protected]
 *
 * Distributed under the terms of the Botan license
 */
diff --git a/src/cert/cvc/freestore.h b/src/cert/cvc/freestore.h
index f95afa802..7f8b85388 100644
--- a/src/cert/cvc/freestore.h
+++ b/src/cert/cvc/freestore.h
@@ -1,7 +1,8 @@
-/**
+/*
 * (C) 2007 Christoph Ludwig
-*          [email protected]
-**/
+*
+* Distributed under the terms of the Botan license
+*/
 
 #ifndef BOTAN_FREESTORE_H__
 #define BOTAN_FREESTORE_H__
@@ -23,8 +24,6 @@ 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/filters/out_buf.cpp b/src/filters/out_buf.cpp
index 6002f4fef..864598194 100644
--- a/src/filters/out_buf.cpp
+++ b/src/filters/out_buf.cpp
@@ -1,5 +1,5 @@
 /*
-* Pipe Output Buffer Source file
+* Pipe Output Buffer
 * (C) 1999-2007 Jack Lloyd
 *
 * Distributed under the terms of the Botan license
diff --git a/src/hash/md4_ia32/md4_ia32_imp.S b/src/hash/md4_ia32/md4_ia32_imp.S
index ca04cbe4e..50f30d9b8 100644
--- a/src/hash/md4_ia32/md4_ia32_imp.S
+++ b/src/hash/md4_ia32/md4_ia32_imp.S
@@ -1,5 +1,5 @@
 /*
-* MD4 Source File
+* MD4 in IA-32 assembler
 * (C) 1999-2007 Jack Lloyd
 *
 * Distributed under the terms of the Botan license
diff --git a/src/hash/md5_ia32/md5_ia32_imp.S b/src/hash/md5_ia32/md5_ia32_imp.S
index 8087bbdbc..bf85a26b6 100644
--- a/src/hash/md5_ia32/md5_ia32_imp.S
+++ b/src/hash/md5_ia32/md5_ia32_imp.S
@@ -1,5 +1,5 @@
 /*
-* MD5 Source File
+* MD5 in IA-32 assembler
 * (C) 1999-2007 Jack Lloyd
 *
 * Distributed under the terms of the Botan license
diff --git a/src/hash/sha1_amd64/sha1_amd64_imp.S b/src/hash/sha1_amd64/sha1_amd64_imp.S
index ba4d4d5ef..e648453dc 100644
--- a/src/hash/sha1_amd64/sha1_amd64_imp.S
+++ b/src/hash/sha1_amd64/sha1_amd64_imp.S
@@ -1,5 +1,5 @@
 /*
-* SHA-160 Source File
+* SHA-1 in x86-64 assembler
 * (C) 1999-2007 Jack Lloyd
 *
 * Distributed under the terms of the Botan license
diff --git a/src/hash/sha1_ia32/sha1_ia32_imp.S b/src/hash/sha1_ia32/sha1_ia32_imp.S
index e76b9fb76..3411313c3 100644
--- a/src/hash/sha1_ia32/sha1_ia32_imp.S
+++ b/src/hash/sha1_ia32/sha1_ia32_imp.S
@@ -1,5 +1,5 @@
 /*
-* SHA-160 Source File
+* SHA-1 in IA-32 assembler
 * (C) 1999-2007 Jack Lloyd
 *
 * Distributed under the terms of the Botan license
diff --git a/src/hash/sha1_sse2/sha1_sse2.cpp b/src/hash/sha1_sse2/sha1_sse2.cpp
index fc6466dd0..9267689e7 100644
--- a/src/hash/sha1_sse2/sha1_sse2.cpp
+++ b/src/hash/sha1_sse2/sha1_sse2.cpp
@@ -4,8 +4,8 @@
 *
 * Distributed under the terms of the Botan license
 *
-* Based on public domain code by Dean Gaudet <[email protected]>
-*   Source - http://arctic.org/~dean/crypto/sha1.html
+* Based on public domain code by Dean Gaudet
+*    (http://arctic.org/~dean/crypto/sha1.html)
 */
 
 #include <botan/sha1_sse2.h>
diff --git a/src/math/bigint/monty_amd64/mp_monty.S b/src/math/bigint/monty_amd64/mp_monty.S
index 22045c369..d5f97601d 100644
--- a/src/math/bigint/monty_amd64/mp_monty.S
+++ b/src/math/bigint/monty_amd64/mp_monty.S
@@ -1,5 +1,5 @@
 /*
-* Montgomery Reduction Source File
+* Montgomery Reduction in x86-64 assembler
 * (C) 2008 Jack Lloyd
 *
 * Distributed under the terms of the Botan license
diff --git a/src/math/bigint/mulop_ia32/mp_mulop.S b/src/math/bigint/mulop_ia32/mp_mulop.S
index 716166fd9..988ef573c 100644
--- a/src/math/bigint/mulop_ia32/mp_mulop.S
+++ b/src/math/bigint/mulop_ia32/mp_mulop.S
@@ -1,5 +1,5 @@
 /*
-* Multiply/Add Algorithm Source File
+* Multiply/Add Algorithm in IA-32 assembler
 * (C) 1999-2007 Jack Lloyd
 *
 * Distributed under the terms of the Botan license
diff --git a/src/math/gfpmath/curve_gfp.h b/src/math/gfpmath/curve_gfp.h
index 81cf6ce51..53bbc1f3c 100644
--- a/src/math/gfpmath/curve_gfp.h
+++ b/src/math/gfpmath/curve_gfp.h
@@ -1,13 +1,10 @@
-/******
- * Elliptic curves over GF(p) (header file)
- *
- * (C) 2007 Martin Doering
- *          [email protected]
- *          Christoph Ludwig
- *          [email protected]
- *          Falko Strenzke
- *          [email protected]
- ******/
+/*
+* Elliptic curves over GF(p)
+*
+* (C) 2007 Martin Doering, Christoph Ludwig, Falko Strenzke
+*
+* Distributed under the terms of the Botan license
+*/
 
 #ifndef BOTAN_GFP_CURVE_H__
 #define BOTAN_GFP_CURVE_H__
@@ -20,8 +17,6 @@ namespace Botan {
 
 /**
 * This class represents an elliptic curve over GF(p)
-*
-* Distributed under the terms of the Botan license
 */
 class BOTAN_DLL CurveGFp
    {
@@ -112,11 +107,12 @@ class BOTAN_DLL CurveGFp
       }*/
 
       /**
-      * Retrieve a shared pointer to the curves GFpModulus object for efficient storage
-      * and computation of montgomery multiplication related data members and functions.
-      * Warning: do not use this function unless you know in detail how the sharing of values
-      * in the various EC related objects works.
-      * Do NOT spread pointers to a GFpModulus over different threads!
+      * Retrieve a shared pointer to the curves GFpModulus object for
+      * efficient storage and computation of montgomery multiplication
+      * related data members and functions.  Warning: do not use this
+      * function unless you know in detail how the sharing of values
+      * in the various EC related objects works.  Do NOT spread
+      * pointers to a GFpModulus over different threads!
       * @result a shared pointer to a GFpModulus object
       */
       inline std::tr1::shared_ptr<GFpModulus> const get_ptr_mod() const
diff --git a/src/math/gfpmath/gfp_element.cpp b/src/math/gfpmath/gfp_element.cpp
index 8ae9b3c3a..4b95e68ff 100644
--- a/src/math/gfpmath/gfp_element.cpp
+++ b/src/math/gfpmath/gfp_element.cpp
@@ -1,12 +1,7 @@
 /*
 * Arithmetic for prime fields GF(p)
 *
-* (C) 2007 Martin Doering
-*          [email protected]
-*          Christoph Ludwig
-*          [email protected]
-*          Falko Strenzke
-*          [email protected]
+* (C) 2007 Martin Doering, Christoph Ludwig, Falko Strenzke
 *
 * Distributed under the terms of the Botan license
 */
@@ -24,7 +19,9 @@ namespace Botan {
 
 namespace {
 
-void inner_montg_mult_sos(word result[], const word* a_bar, const word* b_bar, const word* n, const word* n_dash, u32bit s)
+void inner_montg_mult_sos(word result[],
+                          const word* a_bar, const word* b_bar,
+                          const word* n, const word* n_dash, u32bit s)
    {
    SecureVector<word> t;
    t.grow_to(2*s+1);
@@ -130,10 +127,8 @@ void montg_mult(BigInt& result, BigInt& a_bar, BigInt& b_bar, const BigInt& m, c
    }
 
 /**
-*calculates R=b^n (here b=2) with R>m (and R beeing as small as possible) for an odd modulus m.
-* no check for oddity is performed!
-*
-* Distributed under the terms of the Botan license
+* Calculates R=b^n (here b=2) with R>m (and R beeing as small as
+* possible) for an odd modulus m. No check for parity is performed!
 */
 BigInt montgm_calc_r_oddmod(const BigInt& prime)
    {
diff --git a/src/math/gfpmath/gfp_element.h b/src/math/gfpmath/gfp_element.h
index 18d9e51f9..0fc4e0c7f 100644
--- a/src/math/gfpmath/gfp_element.h
+++ b/src/math/gfpmath/gfp_element.h
@@ -1,12 +1,7 @@
 /*
 * Arithmetic for prime fields GF(p)
 *
-* (C) 2007 Martin Doering
-*          [email protected]
-*          Christoph Ludwig
-*          [email protected]
-*          Falko Strenzke
-*          [email protected]
+* (C) 2007 Martin Doering, Christoph Ludwig, Falko Strenzke
 *
 * Distributed under the terms of the Botan license
 */
diff --git a/src/math/gfpmath/gfp_modulus.h b/src/math/gfpmath/gfp_modulus.h
index 8e37e9a73..4773a8b89 100644
--- a/src/math/gfpmath/gfp_modulus.h
+++ b/src/math/gfpmath/gfp_modulus.h
@@ -1,12 +1,7 @@
 /*
 * Modulus and related data for a specific implementation of GF(p)
 *
-* (C) 2008 Martin Döring
-*          <[email protected]>
-*          Christoph Ludwig
-*          <[email protected]>
-*          Falko Strenzke
-*          <[email protected]>
+* (C) 2008 Martin Doering, Christoph Ludwig, Falko Strenzke
 *
 * Distributed under the terms of the Botan license
 */