22 files changed, 46 insertions, 63 deletions
diff --git a/lib/opencdk/Makefile.am b/lib/opencdk/Makefile.am
index 882c39f060..b2163fe430 100644
--- a/lib/opencdk/Makefile.am
+++ b/lib/opencdk/Makefile.am
@@ -1,6 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2004-2011 Free Software Foundation, Inc.
 #
 # Author: Nikos Mavroyanopoulos
 #
@@ -8,7 +7,7 @@
 #
 # The GnuTLS 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
+# as published by the Free Software Foundation; either version 3 of
 # the License, or (at your option) any later version.
 #
 # The GnuTLS is distributed in the hope that it will be
@@ -16,10 +15,8 @@
 # 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 GnuTLS; 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 this program.  If not, see <http://www.gnu.org/licenses/>
 
 AM_CPPFLAGS = \
 	-I$(srcdir)/../../gl		\
diff --git a/lib/opencdk/armor.c b/lib/opencdk/armor.c
index af35471126..9462b2b15a 100644
--- a/lib/opencdk/armor.c
+++ b/lib/opencdk/armor.c
@@ -16,7 +16,7 @@
  * 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
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  * ChangeLog for basic BASE64 code (base64_encode, base64_decode):
diff --git a/lib/opencdk/context.h b/lib/opencdk/context.h
index 35ffc97d49..929a4af86a 100644
--- a/lib/opencdk/context.h
+++ b/lib/opencdk/context.h
@@ -1,5 +1,5 @@
 /* context.h
- * Copyright (C) 2002, 2003, 2007, 2008, 2010 Free Software Foundation,
+ * Copyright (C) 2002, 2003, 2007, 2008, 2010, 2011 Free Software Foundation,
  * Inc.
  *
  * Author: Timo Schulz
@@ -8,7 +8,7 @@
  *
  * 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
+ * as published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful, but
@@ -16,10 +16,8 @@
  * 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 Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
 #ifndef CDK_CONTEXT_H
diff --git a/lib/opencdk/filters.h b/lib/opencdk/filters.h
index fc770eaabc..2e09e15e84 100644
--- a/lib/opencdk/filters.h
+++ b/lib/opencdk/filters.h
@@ -1,5 +1,5 @@
 /* filters.h - Filter structs
- * Copyright (C) 2002, 2003, 2008, 2010 Free Software Foundation, Inc.
+ * Copyright (C) 2002, 2003, 2008, 2010, 2011 Free Software Foundation, Inc.
  *
  * Author: Timo Schulz
  *
@@ -7,7 +7,7 @@
  *
  * 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
+ * as published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful, but
@@ -15,10 +15,8 @@
  * 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 Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
 #ifndef CDK_FILTERS_H
diff --git a/lib/opencdk/hash.c b/lib/opencdk/hash.c
index 30d6032d44..4e3d5b1ed5 100644
--- a/lib/opencdk/hash.c
+++ b/lib/opencdk/hash.c
@@ -16,7 +16,7 @@
  * 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
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
diff --git a/lib/opencdk/kbnode.c b/lib/opencdk/kbnode.c
index c713cfa01e..8b91e19f6e 100644
--- a/lib/opencdk/kbnode.c
+++ b/lib/opencdk/kbnode.c
@@ -16,7 +16,7 @@
  * 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
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
diff --git a/lib/opencdk/keydb.c b/lib/opencdk/keydb.c
index ca76003b07..c47154ef3f 100644
--- a/lib/opencdk/keydb.c
+++ b/lib/opencdk/keydb.c
@@ -16,7 +16,7 @@
  * 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
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
diff --git a/lib/opencdk/literal.c b/lib/opencdk/literal.c
index a8fd9d159a..be0879a006 100644
--- a/lib/opencdk/literal.c
+++ b/lib/opencdk/literal.c
@@ -16,7 +16,7 @@
  * 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
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
diff --git a/lib/opencdk/main.c b/lib/opencdk/main.c
index 7ee6157924..6d32bd1c36 100644
--- a/lib/opencdk/main.c
+++ b/lib/opencdk/main.c
@@ -16,7 +16,7 @@
  * 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
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
diff --git a/lib/opencdk/main.h b/lib/opencdk/main.h
index 37cc64de48..42e60119d6 100644
--- a/lib/opencdk/main.h
+++ b/lib/opencdk/main.h
@@ -1,5 +1,5 @@
 /* main.h
- * Copyright (C) 2002, 2003, 2007, 2008, 2010 Free Software Foundation,
+ * Copyright (C) 2002, 2003, 2007, 2008, 2010, 2011 Free Software Foundation,
  * Inc.
  *
  * Author: Timo Schulz
@@ -8,7 +8,7 @@
  *
  * 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
+ * as published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful, but
@@ -16,10 +16,8 @@
  * 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 Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
 #ifndef CDK_MAIN_H
diff --git a/lib/opencdk/misc.c b/lib/opencdk/misc.c
index d20cfdf05f..5b6c838bbb 100644
--- a/lib/opencdk/misc.c
+++ b/lib/opencdk/misc.c
@@ -16,7 +16,7 @@
  * 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
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
diff --git a/lib/opencdk/new-packet.c b/lib/opencdk/new-packet.c
index a7809d96e7..1797bdd09e 100644
--- a/lib/opencdk/new-packet.c
+++ b/lib/opencdk/new-packet.c
@@ -16,7 +16,7 @@
  * 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
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
diff --git a/lib/opencdk/opencdk.h b/lib/opencdk/opencdk.h
index 859920aaf7..0b1ec6c7ee 100644
--- a/lib/opencdk/opencdk.h
+++ b/lib/opencdk/opencdk.h
@@ -1,5 +1,5 @@
 /* opencdk.h - Open Crypto Development Kit (OpenCDK)
- * Copyright (C) 2001, 2002, 2003, 2006, 2007, 2008, 2010 Free Software
+ * Copyright (C) 2001, 2002, 2003, 2006, 2007, 2008, 2010, 2011 Free Software
  * Foundation, Inc.
  *
  * Author: Timo Schulz
@@ -8,7 +8,7 @@
  *
  * 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
+ * as published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful, but
@@ -16,10 +16,8 @@
  * 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
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/lib/opencdk/packet.h b/lib/opencdk/packet.h
index eda8735d0f..2872c04b26 100644
--- a/lib/opencdk/packet.h
+++ b/lib/opencdk/packet.h
@@ -1,5 +1,5 @@
 /* packet.h
- * Copyright (C) 2002, 2003, 2007, 2008, 2010 Free Software Foundation,
+ * Copyright (C) 2002, 2003, 2007, 2008, 2010, 2011 Free Software Foundation,
  * Inc.
  *
  * Author: Timo Schulz
@@ -8,7 +8,7 @@
  *
  * 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
+ * as published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful, but
@@ -16,10 +16,8 @@
  * 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
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
 #ifndef CDK_PACKET_H
diff --git a/lib/opencdk/pubkey.c b/lib/opencdk/pubkey.c
index 6d72fbd535..da1e2d3b6b 100644
--- a/lib/opencdk/pubkey.c
+++ b/lib/opencdk/pubkey.c
@@ -16,7 +16,7 @@
  * 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
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
diff --git a/lib/opencdk/read-packet.c b/lib/opencdk/read-packet.c
index ccf222ceb0..df0c04f3d9 100644
--- a/lib/opencdk/read-packet.c
+++ b/lib/opencdk/read-packet.c
@@ -16,7 +16,7 @@
  * 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
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
diff --git a/lib/opencdk/seskey.c b/lib/opencdk/seskey.c
index 65dba33aca..5d97aca04b 100644
--- a/lib/opencdk/seskey.c
+++ b/lib/opencdk/seskey.c
@@ -16,7 +16,7 @@
  * 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
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
diff --git a/lib/opencdk/sig-check.c b/lib/opencdk/sig-check.c
index 79dac5f6b5..b989fb975d 100644
--- a/lib/opencdk/sig-check.c
+++ b/lib/opencdk/sig-check.c
@@ -16,7 +16,7 @@
  * 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
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
diff --git a/lib/opencdk/stream.c b/lib/opencdk/stream.c
index ff1349efa5..0c5f9e90f3 100644
--- a/lib/opencdk/stream.c
+++ b/lib/opencdk/stream.c
@@ -16,7 +16,7 @@
  * 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
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
diff --git a/lib/opencdk/stream.h b/lib/opencdk/stream.h
index 50553b6946..3090f0dbc0 100644
--- a/lib/opencdk/stream.h
+++ b/lib/opencdk/stream.h
@@ -1,5 +1,5 @@
 /* stream.h - internal definiton for the STREAM object
- * Copyright (C) 2002, 2003, 2007, 2008, 2010 Free Software Foundation,
+ * Copyright (C) 2002, 2003, 2007, 2008, 2010, 2011 Free Software Foundation,
  * Inc.
  *
  * Author: Timo Schulz
@@ -8,7 +8,7 @@
  *
  * 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
+ * as published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful, but
@@ -16,10 +16,8 @@
  * 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 Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
 #ifndef CDK_STREAM_H
diff --git a/lib/opencdk/types.h b/lib/opencdk/types.h
index d98ce0643b..7f998f50a7 100644
--- a/lib/opencdk/types.h
+++ b/lib/opencdk/types.h
@@ -1,5 +1,5 @@
 /* types.h - Some type definitions
- * Copyright (C) 2002, 2003, 2007, 2008, 2010 Free Software Foundation,
+ * Copyright (C) 2002, 2003, 2007, 2008, 2010, 2011 Free Software Foundation,
  * Inc.
  *
  * Author: Timo Schulz
@@ -8,7 +8,7 @@
  *
  * 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
+ * as published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful, but
@@ -16,10 +16,8 @@
  * 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 Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
 #ifndef CDK_TYPES_H
diff --git a/lib/opencdk/write-packet.c b/lib/opencdk/write-packet.c
index 59042e97f1..0d8cb1d4c2 100644
--- a/lib/opencdk/write-packet.c
+++ b/lib/opencdk/write-packet.c
@@ -16,7 +16,7 @@
  * 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
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */