Clean up license headers for OpenPGP code.

According to Nikos they are now licensed under the LGPL, see:
http://thread.gmane.org/gmane.comp.encryption.gpg.gnutls.devel/2658/focus=2659

diff --git a/lib/gnutls_openpgp.c b/lib/gnutls_openpgp.c
index 51a99a1d50fc0081fb95b20289cd41466de8c650..590ca1aa8d0cc217b8a59411ccca1101a8015c0f 100644 (file)
--- a/lib/gnutls_openpgp.c
+++ b/lib/gnutls_openpgp.c
@@ -3,20 +3,23 @@
  *
  * Author: Timo Schulz, Nikos Mavrogiannopoulos
  *
- * This file is part of GNUTLS-EXTRA.
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA
  *
- * GNUTLS-EXTRA is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *               
- * GNUTLS-EXTRA 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 General Public License for more details.
- *                               
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "gnutls_int.h"

diff --git a/lib/opencdk/Makefile.am b/lib/opencdk/Makefile.am
index 5f49416bb5a9ee4ae758bd0b9ab240d670f0096e..a612c101bbf55d23c9ff2b9338396a45622738aa 100644 (file)
--- a/lib/opencdk/Makefile.am
+++ b/lib/opencdk/Makefile.am
@@ -1,24 +1,24 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation
+# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation
 #
 # Author: Nikos Mavroyanopoulos
 #
-# This file is part of GNUTLS-EXTRA.
+# This file is part of GNUTLS.
 #
-# GNUTLS-EXTRA is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
+# 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.
 #
-# GNUTLS-EXTRA 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
-# General Public License for more details.
+# The GNUTLS 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 General Public License
-# along with GNUTLS-EXTRA; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# You should have received a copy of the GNU Lesser General Public
+# License along with the GNUTLS library; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA
 
 INCLUDES = -I$(top_srcdir)/lib \
        -I$(top_srcdir)/lgl -I$(top_builddir)/lgl

diff --git a/lib/opencdk/armor.c b/lib/opencdk/armor.c
index 4921995d1c278387494cdc676685128f6c2d3fbd..f5317ed07cb8c6b1d0f6ba49c74e217812bd6b22 100644 (file)
--- a/lib/opencdk/armor.c
+++ b/lib/opencdk/armor.c
@@ -1,6 +1,7 @@
 /* armor.c - Armor filters
- *        Copyright (C) 2001, 2002, 2003, 2007 Timo Schulz
- *        Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2007, 2008 Free Software Foundation, Inc.
+ *
+ * Author: Timo Schulz
  *
  * This file is part of OpenCDK.
  *

diff --git a/lib/opencdk/context.h b/lib/opencdk/context.h
index e65695230232400fa3a9c57611401ea7567d3a36..e70fc57340acc8b0f2dea79dc53cc7aabf993ff7 100644 (file)
--- a/lib/opencdk/context.h
+++ b/lib/opencdk/context.h
@@ -1,17 +1,25 @@
 /* context.h
- *       Copyright (C) 2002, 2003, 2007 Timo Schulz
+ * Copyright (C) 2002, 2003, 2007, 2008 Free Software Foundation, Inc.
+ *
+ * Author: Timo Schulz
  *
  * This file is part of OpenCDK.
  *
- * OpenCDK is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * The OpenCDK 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA
  *
- * OpenCDK 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 General Public License for more details.
  */
 #ifndef CDK_CONTEXT_H
 #define CDK_CONTEXT_H

diff --git a/lib/opencdk/filters.h b/lib/opencdk/filters.h
index a60881edb8839d243bae4f010f0bd2dbe1ee70ca..ebbb4afb2760ab31577c7b8829d54bf4c05097f2 100644 (file)
--- a/lib/opencdk/filters.h
+++ b/lib/opencdk/filters.h
@@ -1,17 +1,25 @@
 /* filters.h - Filter structs
- *        Copyright (C) 2002, 2003 Timo Schulz
+ * Copyright (C) 2002, 2003, 2008 Free Software Foundation, Inc.
+ *
+ * Author: Timo Schulz
  *
  * This file is part of OpenCDK.
  *
- * OpenCDK is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * The OpenCDK 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA
  *
- * OpenCDK 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 General Public License for more details.
  */
 #ifndef CDK_FILTERS_H
 #define CDK_FILTERS_H

diff --git a/lib/opencdk/hash.c b/lib/opencdk/hash.c
index abfc101fca5c1701772c7b8fd42944764ac59cec..4a18b8600eb19ae2844bfdd0f2c133159ea34c91 100644 (file)
--- a/lib/opencdk/hash.c
+++ b/lib/opencdk/hash.c
@@ -1,5 +1,7 @@
 /* hash.c - Hash filters
- *        Copyright (C) 2002, 2003, 2007 Timo Schulz
+ * Copyright (C) 2002, 2003, 2007, 2008 Free Software Foundation
+ *
+ * Author: Timo Schulz
  *
  * This file is part of OpenCDK.
  *
@@ -17,6 +19,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA
+ *
  */
 #ifdef HAVE_CONFIG_H
 # include <config.h>

diff --git a/lib/opencdk/kbnode.c b/lib/opencdk/kbnode.c
index 720bf8a8d0c508e87210a4f22f0fed69a99d9653..8b7a253839f9d1b06f764efe0a58989573d35b9b 100644 (file)
--- a/lib/opencdk/kbnode.c
+++ b/lib/opencdk/kbnode.c
@@ -1,6 +1,7 @@
 /* kbnode.c -  keyblock node utility functions
- *        Copyright (C) 1998-2001, 2008 Free Software Foundation, Inc.
- *        Copyright (C) 2002, 2003, 2007 Timo Schulz
+ * Copyright (C) 1998-2003, 2007, 2008 Free Software Foundation, Inc.
+ *
+ * Author: Timo Schulz
  *
  * This file is part of OpenCDK.
  *
@@ -18,6 +19,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA
+ *
  */
 #ifdef HAVE_CONFIG_H
 # include <config.h>

diff --git a/lib/opencdk/keydb.c b/lib/opencdk/keydb.c
index 0a236ff753923f46319e8722ae70633a9c31585d..4a28f4ec809330319c7d685597f05a7ecf5db608 100644 (file)
--- a/lib/opencdk/keydb.c
+++ b/lib/opencdk/keydb.c
@@ -1,5 +1,7 @@
 /* keydb.c - Key database routines
- *        Copyright (C) 2002, 2003, 2007 Timo Schulz
+ * Copyright (C) 2002, 2003, 2007, 2008 Free Software Foundation, Inc.
+ *
+ * Author: Timo Schulz
  *
  * This file is part of OpenCDK.
  *
@@ -17,6 +19,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA
+ *
  */
 #ifdef HAVE_CONFIG_H
 # include <config.h>

diff --git a/lib/opencdk/literal.c b/lib/opencdk/literal.c
index 438a0b6526d129fc0c55f162fad43ec0bb208a55..09320194416923ce0e226a27024dfdd245b3152a 100644 (file)
--- a/lib/opencdk/literal.c
+++ b/lib/opencdk/literal.c
@@ -1,5 +1,7 @@
-/* Literal.c - Literal packet filters
- *       Copyright (C) 2002, 2003 Timo Schulz
+/* literal.c - Literal packet filters
+ * Copyright (C) 2002, 2003, 2008 Free Software Foundation, Inc.
+ *
+ * Author: Timo Schulz
  *
  * This file is part of OpenCDK.
  *
@@ -17,6 +19,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA
+ *
  */
 #ifdef HAVE_CONFIG_H
 # include <config.h>

diff --git a/lib/opencdk/main.c b/lib/opencdk/main.c
index c0e67da149608ade45640debec540cda1c9c786a..8d504f765a9623c150bead55e60bbaa31eeaf4a7 100644 (file)
--- a/lib/opencdk/main.c
+++ b/lib/opencdk/main.c
@@ -1,5 +1,7 @@
 /* main.c
- *       Copyright (C) 2001, 2002, 2003, 2007 Timo Schulz
+ * Copyright (C) 2001, 2002, 2003, 2007, 2008 Free Software Foundation, Inc.
+ *
+ * Author: Timo Schulz
  *
  * This file is part of OpenCDK.
  *
@@ -17,6 +19,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA
+ *
  */
 #ifdef HAVE_CONFIG_H
 # include <config.h>

diff --git a/lib/opencdk/main.h b/lib/opencdk/main.h
index 3e9a443d8fc04a7c93c63392f2540a84b4292e8e..d924090531222c8034d2e8c4f25dc4c25c1400d1 100644 (file)
--- a/lib/opencdk/main.h
+++ b/lib/opencdk/main.h
@@ -1,17 +1,25 @@
 /* main.h
- *       Copyright (C) 2002, 2003, 2007 Timo Schulz
+ * Copyright (C) 2002, 2003, 2007, 2008 Free Software Foundation, Inc.
+ *
+ * Author: Timo Schulz
  *
  * This file is part of OpenCDK.
  *
- * OpenCDK is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * The OpenCDK 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA
  *
- * OpenCDK 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 General Public License for more details.
  */
 #ifndef CDK_MAIN_H
 #define CDK_MAIN_H

diff --git a/lib/opencdk/misc.c b/lib/opencdk/misc.c
index 35c8ad448200fe8776f232be2fe10ebac96dc1b0..065fb7f274694e3c2bce82b1a14794a38c535dc7 100644 (file)
--- a/lib/opencdk/misc.c
+++ b/lib/opencdk/misc.c
@@ -1,6 +1,7 @@
 /* misc.c
- *        Copyright (C) 2002, 2003 Timo Schulz
- *        Copyright (C) 1998-2002, 2007 Free Software Foundation, Inc.
+ * Copyright (C) 1998-2002, 2003, 2007, 2008 Free Software Foundation, Inc.
+ *
+ * Author: Timo Schulz
  *
  * This file is part of OpenCDK.
  *
@@ -18,6 +19,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA
+ *
  */
 #ifdef HAVE_CONFIG_H
 # include <config.h>

diff --git a/lib/opencdk/new-packet.c b/lib/opencdk/new-packet.c
index c824ed0e812e9cdb67ac3e67a50200fe89f6cfbf..5bd452e3e23936b3cf650e585e4cd3a0746ed1cf 100644 (file)
--- a/lib/opencdk/new-packet.c
+++ b/lib/opencdk/new-packet.c
@@ -1,5 +1,7 @@
 /* new-packet.c - packet handling (freeing, copying, ...)
- *       Copyright (C) 2001, 2002, 2003, 2007 Timo Schulz
+ * Copyright (C) 2001, 2002, 2003, 2007, 2008 Free Software Foundation, Inc.
+ *
+ * Author: Timo Schulz
  *
  * This file is part of OpenCDK.
  *
@@ -17,6 +19,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA
+ *
  */
 #ifdef HAVE_CONFIG_H
 # include <config.h>

diff --git a/lib/opencdk/opencdk.h b/lib/opencdk/opencdk.h
index 43ed3252c0e4455d8086b1b23e0c25f3edb56d4a..df5ea06d76e48e8ce93f2a95c51b564407829c55 100644 (file)
--- a/lib/opencdk/opencdk.h
+++ b/lib/opencdk/opencdk.h
@@ -1,18 +1,25 @@
 /* opencdk.h - Open Crypto Development Kit (OpenCDK)
- *        Copyright (C) 2001, 2002, 2003, 2007 Timo Schulz
- *        Copyright (C) 2006, 2007 Free Software Foundation, Inc. 
+ * Copyright (C) 2001, 2002, 2003, 2006, 2007, 2008 Free Software Foundation, Inc.
+ *
+ * Author: Timo Schulz
  *
  * This file is part of OpenCDK.
  *
- * OpenCDK is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This 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., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
  *
- * OpenCDK 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 General Public License for more details.
  */
 
 #ifndef OPENCDK_H

diff --git a/lib/opencdk/packet.h b/lib/opencdk/packet.h
index 03547acea0bffbd37d9c92f6ca47447d287ca155..ab0c8a58fb98745de6413a45ba9b0103dfeb49fd 100644 (file)
--- a/lib/opencdk/packet.h
+++ b/lib/opencdk/packet.h
@@ -1,17 +1,25 @@
 /* packet.h
- *        Copyright (C) 2002, 2003, 2007 Timo Schulz
+ * Copyright (C) 2002, 2003, 2007, 2008 Free Software Foundation, Inc.
+ *
+ * Author: Timo Schulz
  *
  * This file is part of OpenCDK.
  *
- * OpenCDK is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This 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., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
  *
- * OpenCDK 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 General Public License for more details.
  */
 #ifndef CDK_PACKET_H
 #define CDK_PACKET_H

diff --git a/lib/opencdk/pubkey.c b/lib/opencdk/pubkey.c
index 5a072b56bade70aafcb435a7b29e579af8283b8b..78ff8b0b193de218499135705787eae8fde3b733 100644 (file)
--- a/lib/opencdk/pubkey.c
+++ b/lib/opencdk/pubkey.c
@@ -1,6 +1,7 @@
 /* pubkey.c - Public key API
- *        Copyright (C) 2007 Free Software Foundation, Inc.
- *        Copyright (C) 2002, 2003, 2007 Timo Schulz
+ * Copyright (C) 2002, 2003, 2007, 2008 Free Software Foundation, Inc.
+ *
+ * Author: Timo Schulz
  *
  * This file is part of OpenCDK.
  *
@@ -18,6 +19,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA
+ *
  */
 #ifdef HAVE_CONFIG_H
 #include <config.h>

diff --git a/lib/opencdk/read-packet.c b/lib/opencdk/read-packet.c
index 040f564c49221f3ebe1948d0e0e897569c8aace4..342ca6ec752776e9acdbf10440d174cb51b8e69c 100644 (file)
--- a/lib/opencdk/read-packet.c
+++ b/lib/opencdk/read-packet.c
@@ -1,5 +1,7 @@
 /* read-packet.c - Read OpenPGP packets
- *        Copyright (C) 2001, 2002, 2003, 2007 Timo Schulz
+ * Copyright (C) 2001, 2002, 2003, 2007, 2008 Free Software Foundation, Inc.
+ *
+ * Author: Timo Schulz
  *
  * This file is part of OpenCDK.
  *
@@ -17,6 +19,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA
+ *
  */
 #ifdef HAVE_CONFIG_H
 #include <config.h>

diff --git a/lib/opencdk/seskey.c b/lib/opencdk/seskey.c
index ebf5381db830678935ba09da1c3bd4abfa496e20..f8a9da8e59656d16cbfca61c7207f5145ec35fcb 100644 (file)
--- a/lib/opencdk/seskey.c
+++ b/lib/opencdk/seskey.c
@@ -1,6 +1,7 @@
 /* seskey.c - Session key routines
- *        Copyright (C) 2002, 2003, 2007 Timo Schulz
- *        Copyright (C) 1998-2000, 2002 Free Software Foundation, Inc.
+ * Copyright (C) 1998-2000, 2002, 2003, 2007, 2008 Free Software Foundation, Inc.
+ *
+ * Author: Timo Schulz
  *
  * This file is part of OpenCDK.
  *
@@ -18,6 +19,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA
+ *
  */
 #ifdef HAVE_CONFIG_H
 # include <config.h>

diff --git a/lib/opencdk/sig-check.c b/lib/opencdk/sig-check.c
index f81ae12e4efa88735ae9bc5c868a14f665d3c44c..42268b433c1cf3db715dd1f5303483d80b507a39 100644 (file)
--- a/lib/opencdk/sig-check.c
+++ b/lib/opencdk/sig-check.c
@@ -1,6 +1,7 @@
 /* sig-check.c - Check signatures
- *        Copyright (C) 2001, 2002, 2003, 2007 Timo Schulz
- *        Copyright (C) 1998-2002 Free Software Foundation, Inc.
+ * Copyright (C) 1998-2002, 2003, 2007, 2008 Free Software Foundation, Inc.
+ *
+ * Author: Timo Schulz
  *
  * This file is part of OpenCDK.
  *
@@ -18,6 +19,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA
+ *
  */
 #ifdef HAVE_CONFIG_H
 # include <config.h>

diff --git a/lib/opencdk/stream.c b/lib/opencdk/stream.c
index 02b6346941bd813d1b085432bee77facc3385658..35290768fa8cb3df43bd47379a2d7138149db210 100644 (file)
--- a/lib/opencdk/stream.c
+++ b/lib/opencdk/stream.c
@@ -1,5 +1,7 @@
 /* stream.c - The stream implementation
- *        Copyright (C) 2002, 2003, 2007, 2008 Timo Schulz
+ * Copyright (C) 2002, 2003, 2007, 2008 Free Software Foundation, Inc.
+ *
+ * Author: Timo Schulz
  *
  * This file is part of OpenCDK.
  *
@@ -17,6 +19,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA
+ *
  */
 #ifdef HAVE_CONFIG_H
 #include <config.h>

diff --git a/lib/opencdk/stream.h b/lib/opencdk/stream.h
index df44c6c6b8de4f74d10cd56b0d81260423973693..3291e3a0133100a78ced0f504f0803fab1ab0655 100644 (file)
--- a/lib/opencdk/stream.h
+++ b/lib/opencdk/stream.h
@@ -1,17 +1,25 @@
 /* stream.h - internal definiton for the STREAM object
- *        Copyright (C) 2002, 2003, 2007 Timo Schulz
+ * Copyright (C) 2002, 2003, 2007, 2008 Free Software Foundation, Inc.
+ *
+ * Author: Timo Schulz
  *
  * This file is part of OpenCDK.
  *
- * OpenCDK is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * The OpenCDK 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA
  *
- * OpenCDK 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 General Public License for more details.
  */
 #ifndef CDK_STREAM_H
 #define CDK_STREAM_H

diff --git a/lib/opencdk/types.h b/lib/opencdk/types.h
index c53a0850ae599786a3f0c9ef82eb9b8b1022b749..bba742bcfcbc9876a16776843d17a2a2c34f6733 100644 (file)
--- a/lib/opencdk/types.h
+++ b/lib/opencdk/types.h
@@ -1,17 +1,25 @@
 /* types.h - Some type definitions
- *        Copyright (C) 2002, 2003, 2007 Timo Schulz
+ * Copyright (C) 2002, 2003, 2007, 2008 Free Software Foundation, Inc.
+ *
+ * Author: Timo Schulz
  *
  * This file is part of OpenCDK.
  *
- * OpenCDK is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * The OpenCDK 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA
  *
- * OpenCDK 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 General Public License for more details.
  */
 #ifndef CDK_TYPES_H
 #define CDK_TYPES_H

diff --git a/lib/opencdk/verify.c b/lib/opencdk/verify.c
index 9046952f41b573e43d4d9c7ebae86611133aed1c..c141da8dc604dcff845aa9b211fe016c7a9441b8 100644 (file)
--- a/lib/opencdk/verify.c
+++ b/lib/opencdk/verify.c
@@ -1,5 +1,7 @@
 /* verify.c - Verify signatures
- *        Copyright (C) 2001, 2002, 2003, 2007, 2008 Timo Schulz
+ * Copyright (C) 2001, 2002, 2003, 2007, 2008 Free Software Foundation, Inc.
+ *
+ * Author: Timo Schulz
  *
  * This file is part of OpenCDK.
  *
@@ -17,6 +19,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA
+ *
  */
 #ifdef HAVE_CONFIG_H
 # include <config.h>

diff --git a/lib/opencdk/write-packet.c b/lib/opencdk/write-packet.c
index fb1146e1dd5ab99a0f56b6104c59287824b6e06a..35b6b0f50c177305caf94cc20c7c1875c953bade 100644 (file)
--- a/lib/opencdk/write-packet.c
+++ b/lib/opencdk/write-packet.c
@@ -1,5 +1,7 @@
 /* write-packet.c - Write OpenPGP packets
- *        Copyright (C) 2001, 2002, 2003, 2007 Timo Schulz
+ * Copyright (C) 2001, 2002, 2003, 2007, 2008 Free Software Foundation, Inc.
+ *
+ * Author: Timo Schulz
  *
  * This file is part of OpenCDK.
  *
@@ -17,6 +19,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA
+ *
  */
 #ifdef HAVE_CONFIG_H
 #include <config.h>

diff --git a/lib/openpgp/Makefile.am b/lib/openpgp/Makefile.am
index cf63e31a67783b7e90190af23d1e343f466e9a3c..d84c827cc506eb5923cddb6742604b428dc23fc2 100644 (file)
--- a/lib/openpgp/Makefile.am
+++ b/lib/openpgp/Makefile.am
@@ -3,22 +3,22 @@
 #
 # Author: Nikos Mavrogiannopoulos
 #
-# This file is part of GNUTLS-EXTRA.
+# This file is part of GNUTLS.
 #
-# GNUTLS-EXTRA is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 3 of the
-# License, or (at your option) any later version.
+# 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.
 #
-# GNUTLS-EXTRA 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
-# General Public License for more details.
+# The GNUTLS 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 General Public License
-# along with GNUTLS-EXTRA; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# You should have received a copy of the GNU Lesser General Public
+# License along with the GNUTLS library; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA
 
 AM_CPPFLAGS = -I$(top_srcdir)/lgl -I$(top_builddir)/lgl        \
        -I$(top_srcdir)/crypto -I$(top_srcdir)/lib      \

diff --git a/lib/openpgp/compat.c b/lib/openpgp/compat.c
index 14649304e5d711649cc1304b312445a9988159a9..51b78caf6f44dc36bd3489583041d23471cfd294 100644 (file)
--- a/lib/openpgp/compat.c
+++ b/lib/openpgp/compat.c
@@ -3,20 +3,23 @@
  *
  * Author: Timo Schulz, Nikos Mavrogiannopoulos
  *
- * This file is part of GNUTLS-EXTRA.
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
  *
- * GNUTLS-EXTRA is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *               
- * GNUTLS-EXTRA 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 General Public License for more details.
- *                               
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Compatibility functions on OpenPGP key parsing.

diff --git a/lib/openpgp/extras.c b/lib/openpgp/extras.c
index d91454db09cc8ea0c7317630db15822d1099a318..82ce65f588cb64485f1498186a9dbcd73f6874f6 100644 (file)
--- a/lib/openpgp/extras.c
+++ b/lib/openpgp/extras.c
@@ -3,20 +3,23 @@
  *
  * Author: Nikos Mavrogiannopoulos, Timo Schulz
  *
- * This file is part of GNUTLS-EXTRA.
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
  *
- * GNUTLS-EXTRA is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *               
- * GNUTLS-EXTRA 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 General Public License for more details.
- *                               
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Functions on keyring parsing

diff --git a/lib/openpgp/pgp.c b/lib/openpgp/pgp.c
index 61ced76f8f093cd4542cfd4b043a0f81192b1a36..5e57712f8587a1ec24b31765170fa5db852fd901 100644 (file)
--- a/lib/openpgp/pgp.c
+++ b/lib/openpgp/pgp.c
@@ -3,20 +3,23 @@
  *
  * Author: Timo Schulz, Nikos Mavrogiannopoulos
  *
- * This file is part of GNUTLS-EXTRA.
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
  *
- * GNUTLS-EXTRA is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *               
- * GNUTLS-EXTRA 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 General Public License for more details.
- *                               
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Functions on OpenPGP key parsing

diff --git a/lib/openpgp/pgpverify.c b/lib/openpgp/pgpverify.c
index 0fb9904922daadbad2c3008edf464187ed7ae1c5..34d15fb99c1b367369d05a59b1545e61c45246d4 100644 (file)
--- a/lib/openpgp/pgpverify.c
+++ b/lib/openpgp/pgpverify.c
@@ -3,20 +3,23 @@
  *
  * Author: Timo Schulz, Nikos Mavrogiannopoulos
  *
- * This file is part of GNUTLS-EXTRA.
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
  *
- * GNUTLS-EXTRA is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *               
- * GNUTLS-EXTRA 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 General Public License for more details.
- *                               
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Functions on OpenPGP key parsing

diff --git a/lib/openpgp/privkey.c b/lib/openpgp/privkey.c
index 7fe79efb338940f8706afd90046891ce8c229c43..f326bce88f8132a96e8e9b9a8eca3784785a2aeb 100644 (file)
--- a/lib/openpgp/privkey.c
+++ b/lib/openpgp/privkey.c
@@ -3,20 +3,23 @@
  *
  * Author: Nikos Mavrogiannopoulos
  *
- * This file is part of GNUTLS-EXTRA.
+ * This file is part of GNUTLS.
  *
- * GNUTLS-EXTRA is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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.
  *
- * GNUTLS-EXTRA 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 General Public License for more details.
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Functions on OpenPGP privkey parsing