Clean up license templates.

57 files changed, 91 insertions, 69 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 86cf3cf358..be590ae30b 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,3 +1,23 @@
+## Process this file with automake to produce Makefile.in
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+#
+# This file is part of GNUTLS.
+#
+# The GNUTLS library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License
+# as published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
 SUBDIRS = x509
 if ENABLE_MINITASN1
 SUBDIRS += minitasn1
diff --git a/lib/auth_anon.h b/lib/auth_anon.h
index 30821d0a6b..e7104aa5f3 100644
--- a/lib/auth_anon.h
+++ b/lib/auth_anon.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/auth_cert.h b/lib/auth_cert.h
index 9c25426e07..628ae66dde 100644
--- a/lib/auth_cert.h
+++ b/lib/auth_cert.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/auth_dh_common.h b/lib/auth_dh_common.h
index 471966d9e1..b721199c1b 100644
--- a/lib/auth_dh_common.h
+++ b/lib/auth_dh_common.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/auth_srp.h b/lib/auth_srp.h
index feee6809cc..ae24294d75 100644
--- a/lib/auth_srp.h
+++ b/lib/auth_srp.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/auth_srp_passwd.h b/lib/auth_srp_passwd.h
index 6376df7362..c9910d4563 100644
--- a/lib/auth_srp_passwd.h
+++ b/lib/auth_srp_passwd.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/debug.h b/lib/debug.h
index 0085367fed..a96cc0076a 100644
--- a/lib/debug.h
+++ b/lib/debug.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/defines.h b/lib/defines.h
index 23cbae0387..6e6141fca3 100644
--- a/lib/defines.h
+++ b/lib/defines.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/ext_cert_type.h b/lib/ext_cert_type.h
index e343c578f6..b40dd1f929 100644
--- a/lib/ext_cert_type.h
+++ b/lib/ext_cert_type.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/ext_max_record.h b/lib/ext_max_record.h
index 4e8810990d..5f8332aa26 100644
--- a/lib/ext_max_record.h
+++ b/lib/ext_max_record.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/ext_server_name.h b/lib/ext_server_name.h
index a26af7c2c6..5cb69679c3 100644
--- a/lib/ext_server_name.h
+++ b/lib/ext_server_name.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/ext_srp.h b/lib/ext_srp.h
index 1f07c392cc..d1c05da6fb 100644
--- a/lib/ext_srp.h
+++ b/lib/ext_srp.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls.h.in.in b/lib/gnutls.h.in.in
index 5877f9b028..f1bfdb0a42 100644
--- a/lib/gnutls.h.in.in
+++ b/lib/gnutls.h.in.in
@@ -1,22 +1,24 @@
 /*
- *  Copyright (C) 2004 Free Software Foundation
- *  Copyright (C) 2000,2001,2002,2003 Nikos Mavroyanopoulos
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- *  This file is part of GNUTLS.
+ * Author: Nikos Mavroyanopoulos
  *
- *  The GNUTLS library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public   
- *  License as published by the Free Software Foundation; either 
- *  version 2.1 of the License, or (at your option) any later version.
+ * This file is part of GNUTLS.
  *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of 
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
+ * The GNUTLS library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
  *
  */
 
diff --git a/lib/gnutls_alert.h b/lib/gnutls_alert.h
index 48a278f71f..93788fcfd7 100644
--- a/lib/gnutls_alert.h
+++ b/lib/gnutls_alert.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_algorithms.h b/lib/gnutls_algorithms.h
index c3bb101c65..608017032c 100644
--- a/lib/gnutls_algorithms.h
+++ b/lib/gnutls_algorithms.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_auth.h b/lib/gnutls_auth.h
index 6de50aa3e8..78b49d22cb 100644
--- a/lib/gnutls_auth.h
+++ b/lib/gnutls_auth.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_auth_int.h b/lib/gnutls_auth_int.h
index 0128a7a6d7..4a3b58fc52 100644
--- a/lib/gnutls_auth_int.h
+++ b/lib/gnutls_auth_int.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_buffer.h b/lib/gnutls_buffer.h
index 547411124a..dca2d77b00 100644
--- a/lib/gnutls_buffer.h
+++ b/lib/gnutls_buffer.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_buffers.h b/lib/gnutls_buffers.h
index fe1f80b157..82114973d2 100644
--- a/lib/gnutls_buffers.h
+++ b/lib/gnutls_buffers.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_cert.h b/lib/gnutls_cert.h
index 223c0df147..a9d553d070 100644
--- a/lib/gnutls_cert.h
+++ b/lib/gnutls_cert.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_cipher.h b/lib/gnutls_cipher.h
index c12ef52a57..ae03b36103 100644
--- a/lib/gnutls_cipher.h
+++ b/lib/gnutls_cipher.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_cipher_int.h b/lib/gnutls_cipher_int.h
index 6500bf9dd4..a83372b4a7 100644
--- a/lib/gnutls_cipher_int.h
+++ b/lib/gnutls_cipher_int.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_compress.h b/lib/gnutls_compress.h
index 2c827ef7a4..9694f374ab 100644
--- a/lib/gnutls_compress.h
+++ b/lib/gnutls_compress.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_compress_int.h b/lib/gnutls_compress_int.h
index c985ded3e1..9094f84259 100644
--- a/lib/gnutls_compress_int.h
+++ b/lib/gnutls_compress_int.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_constate.h b/lib/gnutls_constate.h
index a9410cf1bd..6efa507b15 100644
--- a/lib/gnutls_constate.h
+++ b/lib/gnutls_constate.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_datum.h b/lib/gnutls_datum.h
index 64cffc24eb..23abccf4ce 100644
--- a/lib/gnutls_datum.h
+++ b/lib/gnutls_datum.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_db.h b/lib/gnutls_db.h
index b628f1a9c5..402da2681f 100644
--- a/lib/gnutls_db.h
+++ b/lib/gnutls_db.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_dh.h b/lib/gnutls_dh.h
index e3cc3c1efa..3b49209412 100644
--- a/lib/gnutls_dh.h
+++ b/lib/gnutls_dh.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_errors.h b/lib/gnutls_errors.h
index 7560af2818..d370170eba 100644
--- a/lib/gnutls_errors.h
+++ b/lib/gnutls_errors.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_errors_int.h b/lib/gnutls_errors_int.h
index 3660aabbe9..5f853b44f4 100644
--- a/lib/gnutls_errors_int.h
+++ b/lib/gnutls_errors_int.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_extensions.h b/lib/gnutls_extensions.h
index c438a719bd..dd80cc5b7f 100644
--- a/lib/gnutls_extensions.h
+++ b/lib/gnutls_extensions.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_global.h b/lib/gnutls_global.h
index ca1d598219..0febf3417f 100644
--- a/lib/gnutls_global.h
+++ b/lib/gnutls_global.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_handshake.h b/lib/gnutls_handshake.h
index d7f9dd05e4..dcc28c3d8a 100644
--- a/lib/gnutls_handshake.h
+++ b/lib/gnutls_handshake.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_hash_int.h b/lib/gnutls_hash_int.h
index cfe7822822..3a287f34cd 100644
--- a/lib/gnutls_hash_int.h
+++ b/lib/gnutls_hash_int.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index 27ec630ac8..d906bb6dba 100644
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_kx.h b/lib/gnutls_kx.h
index 335040f116..5cea5aade6 100644
--- a/lib/gnutls_kx.h
+++ b/lib/gnutls_kx.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_mem.h b/lib/gnutls_mem.h
index c02d01d108..7f693310e9 100644
--- a/lib/gnutls_mem.h
+++ b/lib/gnutls_mem.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_mpi.h b/lib/gnutls_mpi.h
index aa03de76bf..679c00109d 100644
--- a/lib/gnutls_mpi.h
+++ b/lib/gnutls_mpi.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_num.h b/lib/gnutls_num.h
index f536faa47e..4f74747ca7 100644
--- a/lib/gnutls_num.h
+++ b/lib/gnutls_num.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_pk.h b/lib/gnutls_pk.h
index 0ca9b1b98d..fa183640be 100644
--- a/lib/gnutls_pk.h
+++ b/lib/gnutls_pk.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_priority.h b/lib/gnutls_priority.h
index 86fb38702d..535dfc1086 100644
--- a/lib/gnutls_priority.h
+++ b/lib/gnutls_priority.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_random.h b/lib/gnutls_random.h
index cf16ad39f1..5f92c19178 100644
--- a/lib/gnutls_random.h
+++ b/lib/gnutls_random.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_record.h b/lib/gnutls_record.h
index 3404161318..53285dfdbe 100644
--- a/lib/gnutls_record.h
+++ b/lib/gnutls_record.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_rsa_export.h b/lib/gnutls_rsa_export.h
index ca1f62b305..ff2f40d2e8 100644
--- a/lib/gnutls_rsa_export.h
+++ b/lib/gnutls_rsa_export.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_session.h b/lib/gnutls_session.h
index f9d1d75116..332cf5129d 100644
--- a/lib/gnutls_session.h
+++ b/lib/gnutls_session.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_session_pack.h b/lib/gnutls_session_pack.h
index 416324bf0b..c41bd2d30d 100644
--- a/lib/gnutls_session_pack.h
+++ b/lib/gnutls_session_pack.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_sig.h b/lib/gnutls_sig.h
index ae4268ff37..94ef42a1e8 100644
--- a/lib/gnutls_sig.h
+++ b/lib/gnutls_sig.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_srp.h b/lib/gnutls_srp.h
index d2c90bfbe3..567979c99c 100644
--- a/lib/gnutls_srp.h
+++ b/lib/gnutls_srp.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_state.h b/lib/gnutls_state.h
index fb03ce749e..580a5ccdfe 100644
--- a/lib/gnutls_state.h
+++ b/lib/gnutls_state.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_str.h b/lib/gnutls_str.h
index 92c3af3f8d..5130eda6bd 100644
--- a/lib/gnutls_str.h
+++ b/lib/gnutls_str.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_ui.h b/lib/gnutls_ui.h
index 38fb12627e..c42e890d30 100644
--- a/lib/gnutls_ui.h
+++ b/lib/gnutls_ui.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_v2_compat.h b/lib/gnutls_v2_compat.h
index 81f47a4860..f357f2d94a 100644
--- a/lib/gnutls_v2_compat.h
+++ b/lib/gnutls_v2_compat.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/gnutls_x509.h b/lib/gnutls_x509.h
index 57195d1aa9..ac7f3e46f8 100644
--- a/lib/gnutls_x509.h
+++ b/lib/gnutls_x509.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/io_debug.h b/lib/io_debug.h
index 9629a7ac87..8abdbc4aab 100644
--- a/lib/io_debug.h
+++ b/lib/io_debug.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/strfile.h b/lib/strfile.h
index 7c49ccc703..a8b43a3d19 100644
--- a/lib/strfile.h
+++ b/lib/strfile.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/x509_b64.c b/lib/x509_b64.c
index 1a9030857f..f41cc1b454 100644
--- a/lib/x509_b64.c
+++ b/lib/x509_b64.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *
diff --git a/lib/x509_b64.h b/lib/x509_b64.h
index 8dee500e89..087c4919df 100644
--- a/lib/x509_b64.h
+++ b/lib/x509_b64.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
  *
- * Author: Nikos Mavroyanopoulos <nmav@hellug.gr>
+ * Author: Nikos Mavroyanopoulos
  *
  * This file is part of GNUTLS.
  *