Update FSF office address in license.

7 files changed, 28 insertions, 27 deletions

diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index 2dfeb2bc7b..220efb2dc7 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -1,22 +1,21 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2004 Simon Josefsson
+# Copyright (C) 2004, 2005 Simon Josefsson
 #
-# This file is part of GNU TLS.
+# This file is part of GNUTLS.
 #
-# GNU TLS 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 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.
 #
-# GNU TLS is distributed in the hope that it will be useful, but
+# This file 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.
+# General Public License for more details.
 #
-# You should have received a copy of the GNU Lesser General Public
-# License along with GNU TLS; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA
+# You should have received a copy of the GNU General Public License
+# along with this file; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 AM_CPPFLAGS = @LIBGCRYPT_CFLAGS@ @NETTLE_CFLAGS@
 
diff --git a/crypto/gc-libgcrypt.c b/crypto/gc-libgcrypt.c
index 94e2a69cdf..8e2ad6fa33 100644
--- a/crypto/gc-libgcrypt.c
+++ b/crypto/gc-libgcrypt.c
@@ -1,5 +1,5 @@
 /* gc-libgcrypt.c --- Crypto wrappers around Libgcrypt for GC.
- * Copyright (C) 2002, 2003, 2004  Simon Josefsson
+ * Copyright (C) 2002, 2003, 2004, 2005  Simon Josefsson
  *
  * This file is part of GC.
  *
@@ -14,9 +14,9 @@
  * Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License License along with GC; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * License along with GC; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
  *
  */
 
diff --git a/crypto/gc.h b/crypto/gc.h
index b734e514af..0fa902848c 100644
--- a/crypto/gc.h
+++ b/crypto/gc.h
@@ -1,5 +1,5 @@
 /* gc.h --- Header file for implementation agnostic crypto wrapper API.
- * Copyright (C) 2002, 2003, 2004  Simon Josefsson
+ * Copyright (C) 2002, 2003, 2004, 2005  Simon Josefsson
  *
  * This file is part of GC.
  *
@@ -15,8 +15,8 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with GC; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
  *
  */
 
diff --git a/crypto/pkcs5.c b/crypto/pkcs5.c
index b2c4c89018..00bb3b08b2 100644
--- a/crypto/pkcs5.c
+++ b/crypto/pkcs5.c
@@ -1,5 +1,5 @@
 /* pkcs5.c --- Implementation of Password-Based Cryptography a'la PKCS#5/RFC2898
- * Copyright (C) 2002,2003,2004 Simon Josefsson
+ * Copyright (C) 2002, 2003, 2004, 2005 Simon Josefsson
  * Copyright (C) 2004 Free Software Foundation
  *
  * This file is free software; you can redistribute it and/or
@@ -12,9 +12,10 @@
  * 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 file; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU General Public License
+ * along with this file; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
  *
  */
 
diff --git a/crypto/test-gc.c b/crypto/test-gc.c
index dd4595c63a..0767b3496c 100644
--- a/crypto/test-gc.c
+++ b/crypto/test-gc.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/crypto/utils.c b/crypto/utils.c
index bf49bcd528..8cb85dde8b 100644
--- a/crypto/utils.c
+++ b/crypto/utils.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/crypto/utils.h b/crypto/utils.h
index 844fc7e9c0..12b4953a40 100644
--- a/crypto/utils.h
+++ b/crypto/utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004 Free Software Foundation
+ * Copyright (C) 2004, 2005 Free Software Foundation
  *
  * This file is part of GNUTLS.
  *
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
  */
 
 #ifndef UTILS_H