5 files changed, 4 insertions, 9 deletions
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