From 6b98dddd3c03340d2a35690516f6f315eeaa0afd Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Wed, 3 Aug 2011 09:36:47 +0200 Subject: Clarify license and copyright. --- lib/auth/Makefile.am | 11 ++++------- lib/auth/anon.c | 2 +- lib/auth/anon.h | 11 ++++------- lib/auth/anon_ecdh.c | 2 +- lib/auth/cert.c | 2 +- lib/auth/cert.h | 11 ++++------- lib/auth/dh_common.c | 2 +- lib/auth/dh_common.h | 11 ++++------- lib/auth/dhe.c | 2 +- lib/auth/dhe_psk.c | 2 +- lib/auth/ecdh_common.c | 2 +- lib/auth/ecdh_common.h | 8 +++----- lib/auth/psk.c | 2 +- lib/auth/psk.h | 10 ++++------ lib/auth/psk_passwd.c | 2 +- lib/auth/psk_passwd.h | 10 ++++------ lib/auth/rsa.c | 2 +- lib/auth/rsa_export.c | 2 +- lib/auth/srp.c | 2 +- lib/auth/srp.h | 11 ++++------- lib/auth/srp_passwd.c | 2 +- lib/auth/srp_passwd.h | 11 ++++------- lib/auth/srp_rsa.c | 2 +- lib/auth/srp_sb64.c | 2 +- 24 files changed, 50 insertions(+), 74 deletions(-) (limited to 'lib/auth') diff --git a/lib/auth/Makefile.am b/lib/auth/Makefile.am index c4cad8b58c..e31e95b032 100644 --- a/lib/auth/Makefile.am +++ b/lib/auth/Makefile.am @@ -1,6 +1,5 @@ ## Process this file with automake to produce Makefile.in -# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# Copyright (C) 2002-2011 Free Software Foundation, Inc. # # Author: Nikos Mavrogiannopoulos # @@ -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 AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) AM_CPPFLAGS = \ diff --git a/lib/auth/anon.c b/lib/auth/anon.c index b3b43a7dd0..926bab650a 100644 --- a/lib/auth/anon.c +++ b/lib/auth/anon.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 * */ diff --git a/lib/auth/anon.h b/lib/auth/anon.h index ce51f53376..3006d6bd6d 100644 --- a/lib/auth/anon.h +++ b/lib/auth/anon.h @@ -1,6 +1,5 @@ /* - * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2010 Free Software - * Foundation, Inc. + * Copyright (C) 2001-2011 Free Software Foundation, Inc. * * Author: Nikos Mavrogiannopoulos * @@ -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. * * This library is distributed in the hope that it will be useful, but @@ -16,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 * */ diff --git a/lib/auth/anon_ecdh.c b/lib/auth/anon_ecdh.c index d988c6b396..040f39674e 100644 --- a/lib/auth/anon_ecdh.c +++ b/lib/auth/anon_ecdh.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 * */ diff --git a/lib/auth/cert.c b/lib/auth/cert.c index 207f0031df..fb53fe8885 100644 --- a/lib/auth/cert.c +++ b/lib/auth/cert.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 * */ diff --git a/lib/auth/cert.h b/lib/auth/cert.h index b0199615f6..bb18915848 100644 --- a/lib/auth/cert.h +++ b/lib/auth/cert.h @@ -1,6 +1,5 @@ /* - * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2010 Free Software - * Foundation, Inc. + * Copyright (C) 2002-2011 Free Software Foundation, Inc. * * Author: Nikos Mavrogiannopoulos * @@ -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. * * This library is distributed in the hope that it will be useful, but @@ -16,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 * */ diff --git a/lib/auth/dh_common.c b/lib/auth/dh_common.c index 08c6cb18b7..484fe4fceb 100644 --- a/lib/auth/dh_common.c +++ b/lib/auth/dh_common.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 * */ diff --git a/lib/auth/dh_common.h b/lib/auth/dh_common.h index 2ad459b524..20fc6983db 100644 --- a/lib/auth/dh_common.h +++ b/lib/auth/dh_common.h @@ -1,6 +1,5 @@ /* - * Copyright (C) 2002, 2003, 2004, 2005, 2010 Free Software Foundation, - * Inc. + * Copyright (C) 2002-2011 Free Software Foundation, Inc. * * Author: Nikos Mavrogiannopoulos * @@ -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. * * This library is distributed in the hope that it will be useful, but @@ -16,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 * */ diff --git a/lib/auth/dhe.c b/lib/auth/dhe.c index ed6a49a19e..5e9d5e0a17 100644 --- a/lib/auth/dhe.c +++ b/lib/auth/dhe.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 * */ diff --git a/lib/auth/dhe_psk.c b/lib/auth/dhe_psk.c index 088093a5b0..d1417e34de 100644 --- a/lib/auth/dhe_psk.c +++ b/lib/auth/dhe_psk.c @@ -15,7 +15,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 * */ diff --git a/lib/auth/ecdh_common.c b/lib/auth/ecdh_common.c index 3f0487bb17..2903388fc0 100644 --- a/lib/auth/ecdh_common.c +++ b/lib/auth/ecdh_common.c @@ -15,7 +15,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 * */ diff --git a/lib/auth/ecdh_common.h b/lib/auth/ecdh_common.h index a945fedfd7..b2d25de56c 100644 --- a/lib/auth/ecdh_common.h +++ b/lib/auth/ecdh_common.h @@ -7,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. * * 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 * */ diff --git a/lib/auth/psk.c b/lib/auth/psk.c index 358dac15aa..1817cd4bf1 100644 --- a/lib/auth/psk.c +++ b/lib/auth/psk.c @@ -15,7 +15,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 * */ diff --git a/lib/auth/psk.h b/lib/auth/psk.h index 9a62248c94..aa68e7cbed 100644 --- a/lib/auth/psk.h +++ b/lib/auth/psk.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005, 2007, 2008, 2010 Free Software Foundation, Inc. + * Copyright (C) 2005-2011 Free Software Foundation, Inc. * * Author: Nikos Mavrogiannopoulos * @@ -7,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. * * 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 * */ diff --git a/lib/auth/psk_passwd.c b/lib/auth/psk_passwd.c index 66b94a36ee..7a02c6c907 100644 --- a/lib/auth/psk_passwd.c +++ b/lib/auth/psk_passwd.c @@ -15,7 +15,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 * */ diff --git a/lib/auth/psk_passwd.h b/lib/auth/psk_passwd.h index ba64a5b313..11b08ed667 100644 --- a/lib/auth/psk_passwd.h +++ b/lib/auth/psk_passwd.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005, 2007, 2010 Free Software Foundation, Inc. + * Copyright (C) 2005-2011 Free Software Foundation, Inc. * * Author: Nikos Mavrogiannopoulos * @@ -7,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. * * 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 * */ diff --git a/lib/auth/rsa.c b/lib/auth/rsa.c index f3aaafc012..a9a88aa872 100644 --- a/lib/auth/rsa.c +++ b/lib/auth/rsa.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 * */ diff --git a/lib/auth/rsa_export.c b/lib/auth/rsa_export.c index 9e5d56f2b6..28ef8c67ca 100644 --- a/lib/auth/rsa_export.c +++ b/lib/auth/rsa_export.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 * */ diff --git a/lib/auth/srp.c b/lib/auth/srp.c index 9771f21c5b..068682ced6 100644 --- a/lib/auth/srp.c +++ b/lib/auth/srp.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 * */ diff --git a/lib/auth/srp.h b/lib/auth/srp.h index f730afc4e5..96c97c810c 100644 --- a/lib/auth/srp.h +++ b/lib/auth/srp.h @@ -1,6 +1,5 @@ /* - * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008, 2010 Free Software - * Foundation, Inc. + * Copyright (C) 2001-2011 Free Software Foundation, Inc. * * Author: Nikos Mavrogiannopoulos * @@ -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. * * This library is distributed in the hope that it will be useful, but @@ -16,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 * */ diff --git a/lib/auth/srp_passwd.c b/lib/auth/srp_passwd.c index 35dba6ce9e..a06ae9d985 100644 --- a/lib/auth/srp_passwd.c +++ b/lib/auth/srp_passwd.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 * */ diff --git a/lib/auth/srp_passwd.h b/lib/auth/srp_passwd.h index b8cf855e25..d89c1a4e99 100644 --- a/lib/auth/srp_passwd.h +++ b/lib/auth/srp_passwd.h @@ -1,6 +1,5 @@ /* - * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008, 2010 Free Software - * Foundation, Inc. + * Copyright (C) 2001-2011 Free Software Foundation, Inc. * * Author: Nikos Mavrogiannopoulos * @@ -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. * * This library is distributed in the hope that it will be useful, but @@ -16,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 * */ diff --git a/lib/auth/srp_rsa.c b/lib/auth/srp_rsa.c index bfd6d946a3..614425b343 100644 --- a/lib/auth/srp_rsa.c +++ b/lib/auth/srp_rsa.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 * */ diff --git a/lib/auth/srp_sb64.c b/lib/auth/srp_sb64.c index b43245ab85..ea50c9ad16 100644 --- a/lib/auth/srp_sb64.c +++ b/lib/auth/srp_sb64.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 * */ -- cgit v1.2.1