summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2005-05-26 15:27:12 +0000
committerSimon Josefsson <simon@josefsson.org>2005-05-26 15:27:12 +0000
commit9890323fcbd8fbbfa42720a3d2895cca1a4f0faa (patch)
tree48eda56755b434fb2383430e94c372e2a27e2b71
parentcaee08fbf4a5949021c37e13ba1df01a8a3cf864 (diff)
downloadgnutls-9890323fcbd8fbbfa42720a3d2895cca1a4f0faa.tar.gz
Update FSF office address in license.
-rw-r--r--AUTHORS5
-rw-r--r--COPYING8
-rw-r--r--COPYING.LIB96
-rw-r--r--Makefile.am12
-rw-r--r--NEWS1
-rw-r--r--configure.in2
-rw-r--r--crypto/Makefile.am23
-rw-r--r--crypto/gc-libgcrypt.c8
-rw-r--r--crypto/gc.h6
-rw-r--r--crypto/pkcs5.c9
-rw-r--r--crypto/test-gc.c2
-rw-r--r--crypto/utils.c2
-rw-r--r--crypto/utils.h5
-rw-r--r--doc/Makefile.am8
-rw-r--r--doc/fdl.texi2
-rwxr-xr-xdoc/gendocs.sh2
-rwxr-xr-xdoc/gendocs_template2
-rw-r--r--includes/Makefile.am14
-rw-r--r--includes/gnutls/extra.h6
-rw-r--r--includes/gnutls/gnutls.h.in2
-rw-r--r--includes/gnutls/openpgp.h2
-rw-r--r--includes/gnutls/openssl.h6
-rw-r--r--includes/gnutls/pkcs12.h2
-rw-r--r--includes/gnutls/x509.h2
-rw-r--r--lib/Makefile.am19
-rw-r--r--lib/auth_anon.c2
-rw-r--r--lib/auth_anon.h2
-rw-r--r--lib/auth_cert.c2
-rw-r--r--lib/auth_cert.h2
-rw-r--r--lib/auth_dh_common.c2
-rw-r--r--lib/auth_dh_common.h2
-rw-r--r--lib/auth_dhe.c2
-rw-r--r--lib/auth_rsa.c2
-rw-r--r--lib/auth_rsa_export.c2
-rw-r--r--lib/auth_srp.c2
-rw-r--r--lib/auth_srp.h2
-rw-r--r--lib/auth_srp_passwd.c2
-rw-r--r--lib/auth_srp_passwd.h2
-rw-r--r--lib/auth_srp_rsa.c2
-rw-r--r--lib/auth_srp_sb64.c2
-rw-r--r--lib/debug.c2
-rw-r--r--lib/debug.h2
-rw-r--r--lib/defines.h2
-rw-r--r--lib/ext_cert_type.c2
-rw-r--r--lib/ext_cert_type.h2
-rw-r--r--lib/ext_max_record.c2
-rw-r--r--lib/ext_max_record.h2
-rw-r--r--lib/ext_server_name.c2
-rw-r--r--lib/ext_server_name.h2
-rw-r--r--lib/ext_srp.c2
-rw-r--r--lib/ext_srp.h2
-rw-r--r--lib/gnutls_alert.c2
-rw-r--r--lib/gnutls_algorithms.c2
-rw-r--r--lib/gnutls_algorithms.h2
-rw-r--r--lib/gnutls_anon_cred.c2
-rw-r--r--lib/gnutls_auth.c2
-rw-r--r--lib/gnutls_auth.h2
-rw-r--r--lib/gnutls_auth_int.h2
-rw-r--r--lib/gnutls_buffer.h2
-rw-r--r--lib/gnutls_buffers.c2
-rw-r--r--lib/gnutls_buffers.h2
-rw-r--r--lib/gnutls_cert.c2
-rw-r--r--lib/gnutls_cert.h2
-rw-r--r--lib/gnutls_cipher.c2
-rw-r--r--lib/gnutls_cipher.h2
-rw-r--r--lib/gnutls_cipher_int.c2
-rw-r--r--lib/gnutls_cipher_int.h2
-rw-r--r--lib/gnutls_compress.c2
-rw-r--r--lib/gnutls_compress.h2
-rw-r--r--lib/gnutls_compress_int.c2
-rw-r--r--lib/gnutls_compress_int.h2
-rw-r--r--lib/gnutls_constate.c2
-rw-r--r--lib/gnutls_constate.h2
-rw-r--r--lib/gnutls_datum.c2
-rw-r--r--lib/gnutls_datum.h2
-rw-r--r--lib/gnutls_db.c2
-rw-r--r--lib/gnutls_db.h2
-rw-r--r--lib/gnutls_dh.c2
-rw-r--r--lib/gnutls_dh.h2
-rw-r--r--lib/gnutls_dh_primes.c2
-rw-r--r--lib/gnutls_errors.c2
-rw-r--r--lib/gnutls_errors.h2
-rw-r--r--lib/gnutls_extensions.c2
-rw-r--r--lib/gnutls_extensions.h2
-rw-r--r--lib/gnutls_global.c2
-rw-r--r--lib/gnutls_global.h2
-rw-r--r--lib/gnutls_handshake.c2
-rw-r--r--lib/gnutls_handshake.h2
-rw-r--r--lib/gnutls_hash_int.c2
-rw-r--r--lib/gnutls_hash_int.h2
-rw-r--r--lib/gnutls_int.h2
-rw-r--r--lib/gnutls_kx.c2
-rw-r--r--lib/gnutls_kx.h2
-rw-r--r--lib/gnutls_mem.c2
-rw-r--r--lib/gnutls_mem.h2
-rw-r--r--lib/gnutls_mpi.c2
-rw-r--r--lib/gnutls_mpi.h2
-rw-r--r--lib/gnutls_num.c2
-rw-r--r--lib/gnutls_num.h2
-rw-r--r--lib/gnutls_pk.c2
-rw-r--r--lib/gnutls_pk.h2
-rw-r--r--lib/gnutls_priority.c2
-rw-r--r--lib/gnutls_priority.h2
-rw-r--r--lib/gnutls_random.c2
-rw-r--r--lib/gnutls_random.h2
-rw-r--r--lib/gnutls_record.c2
-rw-r--r--lib/gnutls_record.h2
-rw-r--r--lib/gnutls_rsa_export.c2
-rw-r--r--lib/gnutls_rsa_export.h2
-rw-r--r--lib/gnutls_session.c2
-rw-r--r--lib/gnutls_session.h2
-rw-r--r--lib/gnutls_session_pack.c2
-rw-r--r--lib/gnutls_session_pack.h2
-rw-r--r--lib/gnutls_sig.c2
-rw-r--r--lib/gnutls_sig.h2
-rw-r--r--lib/gnutls_srp.c2
-rw-r--r--lib/gnutls_srp.h2
-rw-r--r--lib/gnutls_state.c2
-rw-r--r--lib/gnutls_state.h2
-rw-r--r--lib/gnutls_str.c2
-rw-r--r--lib/gnutls_str.h2
-rw-r--r--lib/gnutls_ui.c2
-rw-r--r--lib/gnutls_v2_compat.c2
-rw-r--r--lib/gnutls_v2_compat.h2
-rw-r--r--lib/gnutls_x509.c2
-rw-r--r--lib/gnutls_x509.h2
-rw-r--r--lib/io_debug.h2
-rw-r--r--lib/memmem.c2
-rw-r--r--lib/memmem.h2
-rw-r--r--lib/minitasn1/coding.c2
-rw-r--r--lib/minitasn1/decoding.c2
-rw-r--r--lib/minitasn1/element.c2
-rw-r--r--lib/minitasn1/errors.c2
-rw-r--r--lib/minitasn1/errors.h2
-rw-r--r--lib/minitasn1/gstr.c2
-rw-r--r--lib/minitasn1/int.h2
-rw-r--r--lib/minitasn1/libtasn1.h2
-rw-r--r--lib/minitasn1/parser_aux.c2
-rw-r--r--lib/minitasn1/structure.c2
-rw-r--r--lib/strfile.h2
-rw-r--r--lib/x509/Makefile.am2
-rw-r--r--lib/x509/common.c2
-rw-r--r--lib/x509/common.h2
-rw-r--r--lib/x509/compat.c2
-rw-r--r--lib/x509/compat.h2
-rw-r--r--lib/x509/crl.c2
-rw-r--r--lib/x509/crl_write.c2
-rw-r--r--lib/x509/crq.c2
-rw-r--r--lib/x509/crq.h2
-rw-r--r--lib/x509/dn.c2
-rw-r--r--lib/x509/dn.h2
-rw-r--r--lib/x509/dsa.c2
-rw-r--r--lib/x509/dsa.h2
-rw-r--r--lib/x509/extensions.c2
-rw-r--r--lib/x509/extensions.h2
-rw-r--r--lib/x509/mpi.c2
-rw-r--r--lib/x509/mpi.h2
-rw-r--r--lib/x509/pkcs12.c2
-rw-r--r--lib/x509/pkcs12.h2
-rw-r--r--lib/x509/pkcs12_bag.c2
-rw-r--r--lib/x509/pkcs12_encr.c2
-rw-r--r--lib/x509/pkcs7.c2
-rw-r--r--lib/x509/pkcs7.h2
-rw-r--r--lib/x509/privkey.c2
-rw-r--r--lib/x509/privkey.h2
-rw-r--r--lib/x509/privkey_pkcs8.c2
-rw-r--r--lib/x509/rfc2818.h2
-rw-r--r--lib/x509/rfc2818_hostname.c2
-rw-r--r--lib/x509/sign.c2
-rw-r--r--lib/x509/sign.h2
-rw-r--r--lib/x509/verify.c2
-rw-r--r--lib/x509/verify.h2
-rw-r--r--lib/x509/x509.c2
-rw-r--r--lib/x509/x509.h2
-rw-r--r--lib/x509/x509_write.c2
-rw-r--r--lib/x509/xml.c2
-rw-r--r--lib/x509_b64.c2
-rw-r--r--lib/x509_b64.h2
-rw-r--r--libextra/Makefile.am6
-rw-r--r--libextra/gnutls_extra.c6
-rw-r--r--libextra/gnutls_extra.h6
-rw-r--r--libextra/gnutls_openpgp.c6
-rw-r--r--libextra/gnutls_openssl.c6
-rw-r--r--libextra/lzoconf.h2
-rw-r--r--libextra/minilzo.c2
-rw-r--r--libextra/minilzo.h2
-rw-r--r--libextra/opencdk/armor.c2
-rw-r--r--libextra/opencdk/cipher.c2
-rw-r--r--libextra/opencdk/cipher.h2
-rw-r--r--libextra/opencdk/compress.c2
-rw-r--r--libextra/opencdk/context.h2
-rw-r--r--libextra/opencdk/encrypt.c2
-rw-r--r--libextra/opencdk/filters.h2
-rw-r--r--libextra/opencdk/kbnode.c2
-rw-r--r--libextra/opencdk/keydb.c2
-rw-r--r--libextra/opencdk/keygen.c2
-rw-r--r--libextra/opencdk/keylist.c2
-rw-r--r--libextra/opencdk/keyserver.c2
-rw-r--r--libextra/opencdk/main.c5
-rw-r--r--libextra/opencdk/main.h2
-rw-r--r--libextra/opencdk/md.c2
-rw-r--r--libextra/opencdk/md.h2
-rw-r--r--libextra/opencdk/misc.c2
-rw-r--r--libextra/opencdk/new-packet.c2
-rw-r--r--libextra/opencdk/opencdk.h2
-rw-r--r--libextra/opencdk/packet.h2
-rw-r--r--libextra/opencdk/plaintext.c2
-rw-r--r--libextra/opencdk/pubkey.c2
-rw-r--r--libextra/opencdk/read-packet.c2
-rw-r--r--libextra/opencdk/seskey.c2
-rw-r--r--libextra/opencdk/sig-check.c2
-rw-r--r--libextra/opencdk/sign.c2
-rw-r--r--libextra/opencdk/stream.c2
-rw-r--r--libextra/opencdk/stream.h2
-rw-r--r--libextra/opencdk/sym-cipher.c2
-rw-r--r--libextra/opencdk/trustdb.c2
-rw-r--r--libextra/opencdk/types.h2
-rw-r--r--libextra/opencdk/verify.c2
-rw-r--r--libextra/opencdk/write-packet.c2
-rw-r--r--libextra/openpgp/compat.c6
-rw-r--r--libextra/openpgp/extras.c6
-rw-r--r--libextra/openpgp/pgp.c6
-rw-r--r--libextra/openpgp/pgpverify.c6
-rw-r--r--libextra/openpgp/privkey.c6
-rw-r--r--libextra/openpgp/xml.c6
-rw-r--r--libextra/openssl_compat.c6
-rw-r--r--libextra/openssl_compat.h6
-rw-r--r--src/Makefile.am19
-rw-r--r--src/certtool-cfg.c2
-rw-r--r--src/certtool.c2
-rw-r--r--src/cli.c2
-rw-r--r--src/common.c2
-rw-r--r--src/crypt.c2
-rw-r--r--src/list.h2
-rw-r--r--src/prime.c2
-rw-r--r--src/serv.c2
-rw-r--r--src/tests.c2
-rw-r--r--src/tls_test.c2
-rw-r--r--tests/Makefile.am14
-rw-r--r--tests/anonself.c2
-rwxr-xr-xtests/chain2
-rw-r--r--tests/openssl.c2
-rwxr-xr-xtests/pkcs12_neon2
-rwxr-xr-xtests/pkits2
-rwxr-xr-xtests/pkits_crl2
-rwxr-xr-xtests/pkits_crt2
-rwxr-xr-xtests/pkits_pkcs122
-rwxr-xr-xtests/pkits_smime2
-rw-r--r--tests/simple.c2
-rw-r--r--tests/utils.c2
-rw-r--r--tests/utils.h2
251 files changed, 399 insertions, 383 deletions
diff --git a/AUTHORS b/AUTHORS
index cc0e25f19b..181de86a7b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,10 +1,11 @@
GNU TLS AUTHORS -- Information about the authors.
-Copyright (C) 2000, 2001, 2002, 2003, 2004 Nikos Mavroyanopoulos
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Nikos Mavroyanopoulos
See the end for copying conditions.
/*
* The copyright holder for Gnutls is Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
*/
N: Simon Josefsson
diff --git a/COPYING b/COPYING
index 60549be514..3912109b5c 100644
--- a/COPYING
+++ b/COPYING
@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
- Copyright (C) 19yy <name of author>
+ Copyright (C) <year> <name of author>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
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 St, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
@@ -313,7 +313,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
- Gnomovision version 69, Copyright (C) 19yy name of author
+ Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
diff --git a/COPYING.LIB b/COPYING.LIB
index cf9b6b9972..8add30ad59 100644
--- a/COPYING.LIB
+++ b/COPYING.LIB
@@ -1,9 +1,8 @@
-
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -11,7 +10,7 @@
as the successor of the GNU Library Public License, version 2, hence
the version number 2.1.]
- Preamble
+ Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -23,8 +22,7 @@ specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it. You
can use it too, but we suggest you first think carefully about whether
this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
+strategy to use in any particular case, based on the explanations below.
When we speak of free software, we are referring to freedom of use,
not price. Our General Public Licenses are designed to make sure that
@@ -57,7 +55,7 @@ modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.
-^L
+
Finally, software patents pose a constant threat to the existence of
any free program. We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
@@ -89,9 +87,9 @@ libraries. However, the Lesser license provides advantages in certain
special circumstances.
For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes a de-facto standard. To achieve this, non-free programs must
-be allowed to use the library. A more frequent case is that a free
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
library does the same job as widely used non-free libraries. In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.
@@ -113,8 +111,8 @@ modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
-^L
- GNU LESSER GENERAL PUBLIC LICENSE
+
+ GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License Agreement applies to any software library or other
@@ -138,8 +136,8 @@ included without limitation in the term "modification".)
"Source code" for a work means the preferred form of the work for
making modifications to it. For a library, complete source code means
all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation and installation of the library.
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
@@ -148,7 +146,7 @@ such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.
-
+
1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
@@ -218,7 +216,7 @@ instead of to this License. (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
-^L
+
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
@@ -269,7 +267,7 @@ Library will still fall under Section 6.)
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
-^L
+
6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
@@ -305,10 +303,10 @@ of these things:
the user installs one, as long as the modified version is
interface-compatible with the version that the work was made with.
- c) Accompany the work with a written offer, valid for at least
- three years, to give the same user the materials specified in
- Subsection 6a, above, for a charge no more than the cost of
- performing this distribution.
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
d) If distribution of the work is made by offering access to copy
from a designated place, offer equivalent access to copy the above
@@ -331,7 +329,7 @@ restrictions of other proprietary libraries that do not normally
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
-^L
+
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
@@ -372,7 +370,7 @@ subject to these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.
-^L
+
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
@@ -386,10 +384,9 @@ all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
@@ -407,11 +404,11 @@ be a consequence of the rest of this License.
12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
13. The Free Software Foundation may publish revised and/or new
versions of the Lesser General Public License from time to time.
@@ -425,7 +422,7 @@ conditions either of that version or of any later version published by
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
-^L
+
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
@@ -435,7 +432,7 @@ decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.
- NO WARRANTY
+ NO WARRANTY
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -458,22 +455,20 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
- END OF TERMS AND CONDITIONS
-^L
+ END OF TERMS AND CONDITIONS
+
How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
-
- To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should
-have at least the "copyright" line and a pointer to where the full
-notice is found.
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
<one line to give the library's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
@@ -490,17 +485,16 @@ notice is found.
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
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
-You should also get your employer (if you work as a programmer) or
-your school, if any, to sign a "copyright disclaimer" for the library,
-if necessary. Here is a sample; alter the names:
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James
- Random Hacker.
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
<signature of Ty Coon>, 1 April 1990
Ty Coon, President of Vice
diff --git a/Makefile.am b/Makefile.am
index d3d4e94035..9bbf69a8b8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,18 +5,18 @@
#
# This file is part of GNUTLS.
#
-# GNUTLS 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 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.
#
-# GNUTLS 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
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with GNUTLS; if not, write to the Free Software Foundation,
+# along with this file; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
SUBDIRS = gl
diff --git a/NEWS b/NEWS
index a529b52b0a..694beb3692 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,7 @@ See the end for copying conditions.
to marking a trusted chain as non trusted, if the last certificate in
the chain was a self signed one.
- Gnulib portability files were updated.
+- License were updated to reflect new FSF address.
* Version 1.2.3 (2005-04-28)
- Corrected bug in record packet parsing that could lead
diff --git a/configure.in b/configure.in
index 3657c2e124..6655ac1d62 100644
--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,7 @@ dnl Process this file with autoconf to produce a configure script.
#
# You should have received a copy of the GNU General Public License
# along with GNUTLS; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
AC_INIT(gnutls, [1.2.3], [bug-gnutls@gnu.org])
AC_PREREQ(2.59)
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
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 104e2586ba..57ce910ecc 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -5,19 +5,19 @@
#
# This file is part of GNUTLS.
#
-# GNUTLS is free software; you can redistribute it and/or modify it
+# 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.
#
-# GNUTLS 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
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with GNUTLS; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this file; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
EXTRA_DIST = TODO README.CVS README.autoconf certtool.cfg \
gnutls.ps gnutls.pdf gnutls.html
diff --git a/doc/fdl.texi b/doc/fdl.texi
index 11737cc89b..fe78df8d53 100644
--- a/doc/fdl.texi
+++ b/doc/fdl.texi
@@ -7,7 +7,7 @@
@display
Copyright @copyright{} 2000,2001,2002 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
diff --git a/doc/gendocs.sh b/doc/gendocs.sh
index 23c135b118..01b845177e 100755
--- a/doc/gendocs.sh
+++ b/doc/gendocs.sh
@@ -18,7 +18,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, you can either send email to this
# program's maintainer or write to: The Free Software Foundation,
-# Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+# Inc.; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# Original author: Mohit Agarwal.
# Send bug reports and any other correspondence to bug-texinfo@gnu.org.
diff --git a/doc/gendocs_template b/doc/gendocs_template
index cbdcafd1f2..c5890f60a5 100755
--- a/doc/gendocs_template
+++ b/doc/gendocs_template
@@ -89,7 +89,7 @@ Please send broken links and other corrections (or suggestions) to
<p>
Copyright (C) 2004 Free Software Foundation, Inc.,
-59 Temple Place - Suite 330, Boston, MA 02111, USA
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
<br />
Verbatim copying and distribution of this entire article is
permitted in any medium, provided this notice is preserved.
diff --git a/includes/Makefile.am b/includes/Makefile.am
index a92cd19ded..c9be0d20e3 100644
--- a/includes/Makefile.am
+++ b/includes/Makefile.am
@@ -5,19 +5,19 @@
#
# This file is part of GNUTLS.
#
-# GNUTLS 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 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.
#
-# GNUTLS 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
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with GNUTLS; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this file; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
nobase_include_HEADERS = gnutls/extra.h gnutls/x509.h gnutls/pkcs12.h \
gnutls/compat.h gnutls/openpgp.h
diff --git a/includes/gnutls/extra.h b/includes/gnutls/extra.h
index 1e915d7d57..7769878713 100644
--- a/includes/gnutls/extra.h
+++ b/includes/gnutls/extra.h
@@ -16,9 +16,9 @@
* General Public License for more details.
*
* 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
+ * along with GNUTLS-EXTRA; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*
*/
diff --git a/includes/gnutls/gnutls.h.in b/includes/gnutls/gnutls.h.in
index c21fc77b42..5b12f258e2 100644
--- a/includes/gnutls/gnutls.h.in
+++ b/includes/gnutls/gnutls.h.in
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
*/
diff --git a/includes/gnutls/openpgp.h b/includes/gnutls/openpgp.h
index fc0a48cd77..87d38faa4f 100644
--- a/includes/gnutls/openpgp.h
+++ b/includes/gnutls/openpgp.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
*/
diff --git a/includes/gnutls/openssl.h b/includes/gnutls/openssl.h
index 3cb40a333e..fb0dd82568 100644
--- a/includes/gnutls/openssl.h
+++ b/includes/gnutls/openssl.h
@@ -15,9 +15,9 @@
* General Public License for more details.
*
* 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.
+ * along with GNUTLS-EXTRA; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*
*/
diff --git a/includes/gnutls/pkcs12.h b/includes/gnutls/pkcs12.h
index 1c6abc0a33..dd0dbb39a9 100644
--- a/includes/gnutls/pkcs12.h
+++ b/includes/gnutls/pkcs12.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
*/
diff --git a/includes/gnutls/x509.h b/includes/gnutls/x509.h
index 99ae66387b..bc49497eac 100644
--- a/includes/gnutls/x509.h
+++ b/includes/gnutls/x509.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
*/
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 8c4ab26a56..fc8573001d 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -5,20 +5,19 @@
#
# 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 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.
#
-# This library 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 this library; 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.
SUBDIRS = x509
if ENABLE_MINITASN1
diff --git a/lib/auth_anon.c b/lib/auth_anon.c
index 0e9c66e9e1..3933a78dab 100644
--- a/lib/auth_anon.c
+++ b/lib/auth_anon.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/auth_anon.h b/lib/auth_anon.h
index 6dc54f1b13..a447134029 100644
--- a/lib/auth_anon.h
+++ b/lib/auth_anon.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/auth_cert.c b/lib/auth_cert.c
index 61caaffffb..7f8e122215 100644
--- a/lib/auth_cert.c
+++ b/lib/auth_cert.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/auth_cert.h b/lib/auth_cert.h
index d8b0fd6619..05d3890cad 100644
--- a/lib/auth_cert.h
+++ b/lib/auth_cert.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/auth_dh_common.c b/lib/auth_dh_common.c
index a1ec0dd3e1..3c6dc401f8 100644
--- a/lib/auth_dh_common.c
+++ b/lib/auth_dh_common.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/auth_dh_common.h b/lib/auth_dh_common.h
index 2a643df557..c283f1f562 100644
--- a/lib/auth_dh_common.h
+++ b/lib/auth_dh_common.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/auth_dhe.c b/lib/auth_dhe.c
index a576481ba8..ded7aa9565 100644
--- a/lib/auth_dhe.c
+++ b/lib/auth_dhe.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/auth_rsa.c b/lib/auth_rsa.c
index b63937908a..04f816dc3c 100644
--- a/lib/auth_rsa.c
+++ b/lib/auth_rsa.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/auth_rsa_export.c b/lib/auth_rsa_export.c
index 7a682d13b5..1c5a8223cb 100644
--- a/lib/auth_rsa_export.c
+++ b/lib/auth_rsa_export.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/auth_srp.c b/lib/auth_srp.c
index 1f9ebd019a..3a4201d9da 100644
--- a/lib/auth_srp.c
+++ b/lib/auth_srp.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/auth_srp.h b/lib/auth_srp.h
index a7006bc28a..4037150188 100644
--- a/lib/auth_srp.h
+++ b/lib/auth_srp.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/auth_srp_passwd.c b/lib/auth_srp_passwd.c
index 3d172c390c..3d92d7f190 100644
--- a/lib/auth_srp_passwd.c
+++ b/lib/auth_srp_passwd.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/auth_srp_passwd.h b/lib/auth_srp_passwd.h
index c9910d4563..ed526196cf 100644
--- a/lib/auth_srp_passwd.h
+++ b/lib/auth_srp_passwd.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/auth_srp_rsa.c b/lib/auth_srp_rsa.c
index c1ded881a1..2f9b694c16 100644
--- a/lib/auth_srp_rsa.c
+++ b/lib/auth_srp_rsa.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/auth_srp_sb64.c b/lib/auth_srp_sb64.c
index b0b1860de4..b2982101f1 100644
--- a/lib/auth_srp_sb64.c
+++ b/lib/auth_srp_sb64.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/debug.c b/lib/debug.c
index c517d40ec4..9a97f6336b 100644
--- a/lib/debug.c
+++ b/lib/debug.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/debug.h b/lib/debug.h
index 751ad27fa9..666862d6ac 100644
--- a/lib/debug.h
+++ b/lib/debug.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/defines.h b/lib/defines.h
index 6e6141fca3..9ef40e2733 100644
--- a/lib/defines.h
+++ b/lib/defines.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/ext_cert_type.c b/lib/ext_cert_type.c
index 118bdd11c0..2fc93066c6 100644
--- a/lib/ext_cert_type.c
+++ b/lib/ext_cert_type.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/ext_cert_type.h b/lib/ext_cert_type.h
index b40dd1f929..1ae0d17b94 100644
--- a/lib/ext_cert_type.h
+++ b/lib/ext_cert_type.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/ext_max_record.c b/lib/ext_max_record.c
index d381a0d9d4..35e00b1f49 100644
--- a/lib/ext_max_record.c
+++ b/lib/ext_max_record.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/ext_max_record.h b/lib/ext_max_record.h
index 5f8332aa26..b594880730 100644
--- a/lib/ext_max_record.h
+++ b/lib/ext_max_record.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/ext_server_name.c b/lib/ext_server_name.c
index 5ee2bc9f34..287f1881b1 100644
--- a/lib/ext_server_name.c
+++ b/lib/ext_server_name.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/ext_server_name.h b/lib/ext_server_name.h
index 5cb69679c3..4283168046 100644
--- a/lib/ext_server_name.h
+++ b/lib/ext_server_name.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/ext_srp.c b/lib/ext_srp.c
index f5f3ceb8d8..cb9260c326 100644
--- a/lib/ext_srp.c
+++ b/lib/ext_srp.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/ext_srp.h b/lib/ext_srp.h
index d1c05da6fb..4d345ea9e3 100644
--- a/lib/ext_srp.h
+++ b/lib/ext_srp.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_alert.c b/lib/gnutls_alert.c
index c1359a4c89..ea34abb82b 100644
--- a/lib/gnutls_alert.c
+++ b/lib/gnutls_alert.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_algorithms.c b/lib/gnutls_algorithms.c
index 7b7ef8bdc1..d47acab9fc 100644
--- a/lib/gnutls_algorithms.c
+++ b/lib/gnutls_algorithms.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_algorithms.h b/lib/gnutls_algorithms.h
index 8bf7da1d1e..09b1e25161 100644
--- a/lib/gnutls_algorithms.h
+++ b/lib/gnutls_algorithms.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_anon_cred.c b/lib/gnutls_anon_cred.c
index d44a78d646..eb34478cca 100644
--- a/lib/gnutls_anon_cred.c
+++ b/lib/gnutls_anon_cred.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_auth.c b/lib/gnutls_auth.c
index a4cfb646e8..e1a3811ab2 100644
--- a/lib/gnutls_auth.c
+++ b/lib/gnutls_auth.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_auth.h b/lib/gnutls_auth.h
index 78b49d22cb..6d86584953 100644
--- a/lib/gnutls_auth.h
+++ b/lib/gnutls_auth.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_auth_int.h b/lib/gnutls_auth_int.h
index bd0b35181d..9c6fb9ad13 100644
--- a/lib/gnutls_auth_int.h
+++ b/lib/gnutls_auth_int.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_buffer.h b/lib/gnutls_buffer.h
index dca2d77b00..327d3aa127 100644
--- a/lib/gnutls_buffer.h
+++ b/lib/gnutls_buffer.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_buffers.c b/lib/gnutls_buffers.c
index 6ef024d881..2e6d79e600 100644
--- a/lib/gnutls_buffers.c
+++ b/lib/gnutls_buffers.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_buffers.h b/lib/gnutls_buffers.h
index 121311186f..4b565c6c0d 100644
--- a/lib/gnutls_buffers.h
+++ b/lib/gnutls_buffers.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_cert.c b/lib/gnutls_cert.c
index e74c4edd92..d259db78e0 100644
--- a/lib/gnutls_cert.c
+++ b/lib/gnutls_cert.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_cert.h b/lib/gnutls_cert.h
index 3298c96e5a..99aaeca463 100644
--- a/lib/gnutls_cert.h
+++ b/lib/gnutls_cert.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_cipher.c b/lib/gnutls_cipher.c
index cc660c8451..42a14909eb 100644
--- a/lib/gnutls_cipher.c
+++ b/lib/gnutls_cipher.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_cipher.h b/lib/gnutls_cipher.h
index ae03b36103..73d0e81a2a 100644
--- a/lib/gnutls_cipher.h
+++ b/lib/gnutls_cipher.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_cipher_int.c b/lib/gnutls_cipher_int.c
index 13be143e49..658b6cb77b 100644
--- a/lib/gnutls_cipher_int.c
+++ b/lib/gnutls_cipher_int.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_cipher_int.h b/lib/gnutls_cipher_int.h
index a83372b4a7..e9c84e423f 100644
--- a/lib/gnutls_cipher_int.h
+++ b/lib/gnutls_cipher_int.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_compress.c b/lib/gnutls_compress.c
index 569259cddd..2ce64cd708 100644
--- a/lib/gnutls_compress.c
+++ b/lib/gnutls_compress.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_compress.h b/lib/gnutls_compress.h
index d6859bf196..fb66d188a4 100644
--- a/lib/gnutls_compress.h
+++ b/lib/gnutls_compress.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_compress_int.c b/lib/gnutls_compress_int.c
index 16919c1248..77c747b65b 100644
--- a/lib/gnutls_compress_int.c
+++ b/lib/gnutls_compress_int.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_compress_int.h b/lib/gnutls_compress_int.h
index 9094f84259..b7e0ebc0af 100644
--- a/lib/gnutls_compress_int.h
+++ b/lib/gnutls_compress_int.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_constate.c b/lib/gnutls_constate.c
index f1da2ee565..2f56869b95 100644
--- a/lib/gnutls_constate.c
+++ b/lib/gnutls_constate.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_constate.h b/lib/gnutls_constate.h
index 6efa507b15..de8ae4db53 100644
--- a/lib/gnutls_constate.h
+++ b/lib/gnutls_constate.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_datum.c b/lib/gnutls_datum.c
index 01d57421d1..d21ea97546 100644
--- a/lib/gnutls_datum.c
+++ b/lib/gnutls_datum.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_datum.h b/lib/gnutls_datum.h
index 23abccf4ce..fe195de9f7 100644
--- a/lib/gnutls_datum.h
+++ b/lib/gnutls_datum.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_db.c b/lib/gnutls_db.c
index 967200efc2..df3a98155e 100644
--- a/lib/gnutls_db.c
+++ b/lib/gnutls_db.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_db.h b/lib/gnutls_db.h
index 2c4045bd45..5d23045f5f 100644
--- a/lib/gnutls_db.h
+++ b/lib/gnutls_db.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_dh.c b/lib/gnutls_dh.c
index f33aa47aef..6a50943d03 100644
--- a/lib/gnutls_dh.c
+++ b/lib/gnutls_dh.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_dh.h b/lib/gnutls_dh.h
index ae69a44ab9..169df8cbe3 100644
--- a/lib/gnutls_dh.h
+++ b/lib/gnutls_dh.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_dh_primes.c b/lib/gnutls_dh_primes.c
index 7e558b7e3c..a4218c8102 100644
--- a/lib/gnutls_dh_primes.c
+++ b/lib/gnutls_dh_primes.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_errors.c b/lib/gnutls_errors.c
index 60272679c0..a4bed7c42e 100644
--- a/lib/gnutls_errors.c
+++ b/lib/gnutls_errors.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_errors.h b/lib/gnutls_errors.h
index 10168b8197..7510bb047a 100644
--- a/lib/gnutls_errors.h
+++ b/lib/gnutls_errors.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_extensions.c b/lib/gnutls_extensions.c
index 4b4c24c5a1..11e4c1a83b 100644
--- a/lib/gnutls_extensions.c
+++ b/lib/gnutls_extensions.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_extensions.h b/lib/gnutls_extensions.h
index dd80cc5b7f..8789201edf 100644
--- a/lib/gnutls_extensions.h
+++ b/lib/gnutls_extensions.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_global.c b/lib/gnutls_global.c
index 13fc273a35..6972d33804 100644
--- a/lib/gnutls_global.c
+++ b/lib/gnutls_global.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_global.h b/lib/gnutls_global.h
index 868588c1e6..fd4fcaeade 100644
--- a/lib/gnutls_global.h
+++ b/lib/gnutls_global.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index f3d6a17bbe..ad95108c47 100644
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_handshake.h b/lib/gnutls_handshake.h
index b83ae0626f..f684b70ee3 100644
--- a/lib/gnutls_handshake.h
+++ b/lib/gnutls_handshake.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_hash_int.c b/lib/gnutls_hash_int.c
index b28d16a30e..c60fe215de 100644
--- a/lib/gnutls_hash_int.c
+++ b/lib/gnutls_hash_int.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_hash_int.h b/lib/gnutls_hash_int.h
index 028e3e40ca..2e210306e8 100644
--- a/lib/gnutls_hash_int.h
+++ b/lib/gnutls_hash_int.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index ea07fe48d4..7bbe00810c 100644
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_kx.c b/lib/gnutls_kx.c
index 4f7a49159b..ee545243e5 100644
--- a/lib/gnutls_kx.c
+++ b/lib/gnutls_kx.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_kx.h b/lib/gnutls_kx.h
index 5cea5aade6..e92dbe3b4f 100644
--- a/lib/gnutls_kx.h
+++ b/lib/gnutls_kx.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_mem.c b/lib/gnutls_mem.c
index 6040c83daa..81fb1a1be3 100644
--- a/lib/gnutls_mem.c
+++ b/lib/gnutls_mem.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_mem.h b/lib/gnutls_mem.h
index f4e66f4262..b1263c65bb 100644
--- a/lib/gnutls_mem.h
+++ b/lib/gnutls_mem.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_mpi.c b/lib/gnutls_mpi.c
index 0d885b1cd4..d2fd934748 100644
--- a/lib/gnutls_mpi.c
+++ b/lib/gnutls_mpi.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_mpi.h b/lib/gnutls_mpi.h
index 3e91ef51e1..bb8d6663a3 100644
--- a/lib/gnutls_mpi.h
+++ b/lib/gnutls_mpi.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_num.c b/lib/gnutls_num.c
index 81f794f9b7..00e6655ccb 100644
--- a/lib/gnutls_num.c
+++ b/lib/gnutls_num.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_num.h b/lib/gnutls_num.h
index 4f74747ca7..5d71ae9e94 100644
--- a/lib/gnutls_num.h
+++ b/lib/gnutls_num.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_pk.c b/lib/gnutls_pk.c
index 9293ef72b9..9f2183cefd 100644
--- a/lib/gnutls_pk.c
+++ b/lib/gnutls_pk.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_pk.h b/lib/gnutls_pk.h
index fa183640be..714fba92da 100644
--- a/lib/gnutls_pk.h
+++ b/lib/gnutls_pk.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
index 40d99b7bc8..3c19e13a12 100644
--- a/lib/gnutls_priority.c
+++ b/lib/gnutls_priority.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_priority.h b/lib/gnutls_priority.h
index 535dfc1086..7f47c732ff 100644
--- a/lib/gnutls_priority.h
+++ b/lib/gnutls_priority.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_random.c b/lib/gnutls_random.c
index ba22634ce3..7810cf4163 100644
--- a/lib/gnutls_random.c
+++ b/lib/gnutls_random.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_random.h b/lib/gnutls_random.h
index 5f92c19178..ed5d5f6e37 100644
--- a/lib/gnutls_random.h
+++ b/lib/gnutls_random.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c
index f5a8da09b7..4a49671e02 100644
--- a/lib/gnutls_record.c
+++ b/lib/gnutls_record.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_record.h b/lib/gnutls_record.h
index 05cf4e66fd..76e23e8eb5 100644
--- a/lib/gnutls_record.h
+++ b/lib/gnutls_record.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_rsa_export.c b/lib/gnutls_rsa_export.c
index 62789ea3ba..eaea9c04eb 100644
--- a/lib/gnutls_rsa_export.c
+++ b/lib/gnutls_rsa_export.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_rsa_export.h b/lib/gnutls_rsa_export.h
index 6b7641eca1..152d279eb5 100644
--- a/lib/gnutls_rsa_export.h
+++ b/lib/gnutls_rsa_export.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_session.c b/lib/gnutls_session.c
index 3cc2f64e52..a349cf4450 100644
--- a/lib/gnutls_session.c
+++ b/lib/gnutls_session.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_session.h b/lib/gnutls_session.h
index 18037c1543..bf5449330b 100644
--- a/lib/gnutls_session.h
+++ b/lib/gnutls_session.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_session_pack.c b/lib/gnutls_session_pack.c
index acf029a2b3..4f937febe6 100644
--- a/lib/gnutls_session_pack.c
+++ b/lib/gnutls_session_pack.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_session_pack.h b/lib/gnutls_session_pack.h
index c41bd2d30d..4265ab27a0 100644
--- a/lib/gnutls_session_pack.h
+++ b/lib/gnutls_session_pack.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_sig.c b/lib/gnutls_sig.c
index 0983ac22f2..ac4fa7704e 100644
--- a/lib/gnutls_sig.c
+++ b/lib/gnutls_sig.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_sig.h b/lib/gnutls_sig.h
index 2bbb284d62..cf3615ccf7 100644
--- a/lib/gnutls_sig.h
+++ b/lib/gnutls_sig.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_srp.c b/lib/gnutls_srp.c
index f752d72b37..06a6ec178f 100644
--- a/lib/gnutls_srp.c
+++ b/lib/gnutls_srp.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_srp.h b/lib/gnutls_srp.h
index 567979c99c..4de701d77d 100644
--- a/lib/gnutls_srp.h
+++ b/lib/gnutls_srp.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_state.c b/lib/gnutls_state.c
index 850b606086..d91b1c3c5f 100644
--- a/lib/gnutls_state.c
+++ b/lib/gnutls_state.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_state.h b/lib/gnutls_state.h
index 5a0c39d46d..5a3f5d717b 100644
--- a/lib/gnutls_state.h
+++ b/lib/gnutls_state.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_str.c b/lib/gnutls_str.c
index 30e4d8fc10..a4c2ebccca 100644
--- a/lib/gnutls_str.c
+++ b/lib/gnutls_str.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_str.h b/lib/gnutls_str.h
index 5130eda6bd..052be7af2d 100644
--- a/lib/gnutls_str.h
+++ b/lib/gnutls_str.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_ui.c b/lib/gnutls_ui.c
index 7ff94c03a6..f825237da7 100644
--- a/lib/gnutls_ui.c
+++ b/lib/gnutls_ui.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_v2_compat.c b/lib/gnutls_v2_compat.c
index cbb5568a7f..2cc34acfbd 100644
--- a/lib/gnutls_v2_compat.c
+++ b/lib/gnutls_v2_compat.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_v2_compat.h b/lib/gnutls_v2_compat.h
index f357f2d94a..09e5044304 100644
--- a/lib/gnutls_v2_compat.h
+++ b/lib/gnutls_v2_compat.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c
index 8f4883b64f..d9bb024d60 100644
--- a/lib/gnutls_x509.c
+++ b/lib/gnutls_x509.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/gnutls_x509.h b/lib/gnutls_x509.h
index ac7f3e46f8..82183a6440 100644
--- a/lib/gnutls_x509.h
+++ b/lib/gnutls_x509.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/io_debug.h b/lib/io_debug.h
index 8abdbc4aab..f04df369c6 100644
--- a/lib/io_debug.h
+++ b/lib/io_debug.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/memmem.c b/lib/memmem.c
index 7d4714b8d7..c49dfe0ce4 100644
--- a/lib/memmem.c
+++ b/lib/memmem.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU Lesser 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. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#include <stddef.h>
#include <string.h>
diff --git a/lib/memmem.h b/lib/memmem.h
index d98f80b620..047998e9b8 100644
--- a/lib/memmem.h
+++ b/lib/memmem.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/minitasn1/coding.c b/lib/minitasn1/coding.c
index 67accd757b..fde511b1eb 100644
--- a/lib/minitasn1/coding.c
+++ b/lib/minitasn1/coding.c
@@ -16,7 +16,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
diff --git a/lib/minitasn1/decoding.c b/lib/minitasn1/decoding.c
index a0ae7a9fb7..8eafb1d81e 100644
--- a/lib/minitasn1/decoding.c
+++ b/lib/minitasn1/decoding.c
@@ -16,7 +16,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
diff --git a/lib/minitasn1/element.c b/lib/minitasn1/element.c
index f4b79e75f8..4357634678 100644
--- a/lib/minitasn1/element.c
+++ b/lib/minitasn1/element.c
@@ -16,7 +16,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/*****************************************************/
diff --git a/lib/minitasn1/errors.c b/lib/minitasn1/errors.c
index 5bfb47c10f..96fdd3ec6b 100644
--- a/lib/minitasn1/errors.c
+++ b/lib/minitasn1/errors.c
@@ -14,7 +14,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <int.h>
diff --git a/lib/minitasn1/errors.h b/lib/minitasn1/errors.h
index 478ebecb2a..b4a03713ca 100644
--- a/lib/minitasn1/errors.h
+++ b/lib/minitasn1/errors.h
@@ -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
*/
#ifndef ERRORS_H
diff --git a/lib/minitasn1/gstr.c b/lib/minitasn1/gstr.c
index 918ab4dd07..ab2c5ac2d6 100644
--- a/lib/minitasn1/gstr.c
+++ b/lib/minitasn1/gstr.c
@@ -15,7 +15,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <int.h>
diff --git a/lib/minitasn1/int.h b/lib/minitasn1/int.h
index 96252670ed..c9f2dc919e 100644
--- a/lib/minitasn1/int.h
+++ b/lib/minitasn1/int.h
@@ -16,7 +16,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
*/
#ifndef INT_H
diff --git a/lib/minitasn1/libtasn1.h b/lib/minitasn1/libtasn1.h
index 45991ef640..e5c573666b 100644
--- a/lib/minitasn1/libtasn1.h
+++ b/lib/minitasn1/libtasn1.h
@@ -16,7 +16,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*
*/
diff --git a/lib/minitasn1/parser_aux.c b/lib/minitasn1/parser_aux.c
index 05cf5d8e42..b86d9ff65e 100644
--- a/lib/minitasn1/parser_aux.c
+++ b/lib/minitasn1/parser_aux.c
@@ -16,7 +16,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <int.h>
diff --git a/lib/minitasn1/structure.c b/lib/minitasn1/structure.c
index 0bc26f52f2..dd138cba50 100644
--- a/lib/minitasn1/structure.c
+++ b/lib/minitasn1/structure.c
@@ -16,7 +16,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
diff --git a/lib/strfile.h b/lib/strfile.h
index a8b43a3d19..0d376f752c 100644
--- a/lib/strfile.h
+++ b/lib/strfile.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/Makefile.am b/lib/x509/Makefile.am
index 38250c13cf..de9d124529 100644
--- a/lib/x509/Makefile.am
+++ b/lib/x509/Makefile.am
@@ -15,7 +15,7 @@
#
# 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
# USA
INCLUDES = -I$(top_srcdir)/crypto -I$(top_srcdir)/gl -I$(top_srcdir)/libextra -I$(top_srcdir)/lib/minitasn1 -I$(top_srcdir)/libextra/openpgp/ -I$(top_srcdir)/libextra/opencdk -I$(top_srcdir)/lib -I$(top_srcdir)/includes $(LIBOPENCDK_CFLAGS) $(LIBTASN1_CFLAGS) $(LIBGCRYPT_CFLAGS)
diff --git a/lib/x509/common.c b/lib/x509/common.c
index 89a4c5d706..a619e59625 100644
--- a/lib/x509/common.c
+++ b/lib/x509/common.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/common.h b/lib/x509/common.h
index bb4ab42261..ec700faa04 100644
--- a/lib/x509/common.h
+++ b/lib/x509/common.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/compat.c b/lib/x509/compat.c
index e4c50c38d5..ea3c6db596 100644
--- a/lib/x509/compat.c
+++ b/lib/x509/compat.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/compat.h b/lib/x509/compat.h
index 947844d13c..d0639ec542 100644
--- a/lib/x509/compat.h
+++ b/lib/x509/compat.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/crl.c b/lib/x509/crl.c
index 06d7c21ff3..20f8321209 100644
--- a/lib/x509/crl.c
+++ b/lib/x509/crl.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/crl_write.c b/lib/x509/crl_write.c
index 79b4fdf097..62f8fa8400 100644
--- a/lib/x509/crl_write.c
+++ b/lib/x509/crl_write.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/crq.c b/lib/x509/crq.c
index e595b48259..8855f3b85b 100644
--- a/lib/x509/crq.c
+++ b/lib/x509/crq.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/crq.h b/lib/x509/crq.h
index 2000a6ea5a..b3fad9df7c 100644
--- a/lib/x509/crq.h
+++ b/lib/x509/crq.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/dn.c b/lib/x509/dn.c
index c10840b0f2..93953751e2 100644
--- a/lib/x509/dn.c
+++ b/lib/x509/dn.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/dn.h b/lib/x509/dn.h
index 53d79f1ecd..77d0356470 100644
--- a/lib/x509/dn.h
+++ b/lib/x509/dn.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/dsa.c b/lib/x509/dsa.c
index 88863f3d7a..358fbb91bc 100644
--- a/lib/x509/dsa.c
+++ b/lib/x509/dsa.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/dsa.h b/lib/x509/dsa.h
index e0e6c9a694..0ab9f113fc 100644
--- a/lib/x509/dsa.h
+++ b/lib/x509/dsa.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/extensions.c b/lib/x509/extensions.c
index 5ce3e574a7..435a1d94d9 100644
--- a/lib/x509/extensions.c
+++ b/lib/x509/extensions.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/extensions.h b/lib/x509/extensions.h
index 09ac410628..96fa52bf2b 100644
--- a/lib/x509/extensions.h
+++ b/lib/x509/extensions.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/mpi.c b/lib/x509/mpi.c
index 9af65b2a73..0ef4b68287 100644
--- a/lib/x509/mpi.c
+++ b/lib/x509/mpi.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/mpi.h b/lib/x509/mpi.h
index d45d93cc7c..af5c0eb3eb 100644
--- a/lib/x509/mpi.h
+++ b/lib/x509/mpi.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/pkcs12.c b/lib/x509/pkcs12.c
index d4ccbe087c..1e85f4fc4c 100644
--- a/lib/x509/pkcs12.c
+++ b/lib/x509/pkcs12.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/pkcs12.h b/lib/x509/pkcs12.h
index 441a78df6d..45769c995e 100644
--- a/lib/x509/pkcs12.h
+++ b/lib/x509/pkcs12.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/pkcs12_bag.c b/lib/x509/pkcs12_bag.c
index 96a700f4ca..33cae02ec3 100644
--- a/lib/x509/pkcs12_bag.c
+++ b/lib/x509/pkcs12_bag.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/pkcs12_encr.c b/lib/x509/pkcs12_encr.c
index e335425af0..cd53b94621 100644
--- a/lib/x509/pkcs12_encr.c
+++ b/lib/x509/pkcs12_encr.c
@@ -16,7 +16,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/pkcs7.c b/lib/x509/pkcs7.c
index 29c8d1dd96..6507704546 100644
--- a/lib/x509/pkcs7.c
+++ b/lib/x509/pkcs7.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/pkcs7.h b/lib/x509/pkcs7.h
index 0c0de31287..1c1adc6e62 100644
--- a/lib/x509/pkcs7.h
+++ b/lib/x509/pkcs7.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c
index 4360e0f9ca..d9cc20e9e6 100644
--- a/lib/x509/privkey.c
+++ b/lib/x509/privkey.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/privkey.h b/lib/x509/privkey.h
index 141d0c38bd..d510270e0c 100644
--- a/lib/x509/privkey.h
+++ b/lib/x509/privkey.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/privkey_pkcs8.c b/lib/x509/privkey_pkcs8.c
index 1f4529402d..5a63400fa3 100644
--- a/lib/x509/privkey_pkcs8.c
+++ b/lib/x509/privkey_pkcs8.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/rfc2818.h b/lib/x509/rfc2818.h
index eebc7fb82f..ed9749a734 100644
--- a/lib/x509/rfc2818.h
+++ b/lib/x509/rfc2818.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/rfc2818_hostname.c b/lib/x509/rfc2818_hostname.c
index e0bdaa12a7..a1075ce24a 100644
--- a/lib/x509/rfc2818_hostname.c
+++ b/lib/x509/rfc2818_hostname.c
@@ -16,7 +16,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/sign.c b/lib/x509/sign.c
index 37c39204ef..01f4bf5425 100644
--- a/lib/x509/sign.c
+++ b/lib/x509/sign.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/sign.h b/lib/x509/sign.h
index b3aa0f019f..b06e57e48c 100644
--- a/lib/x509/sign.h
+++ b/lib/x509/sign.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/verify.c b/lib/x509/verify.c
index 4cd5b7fc58..387dd79bf4 100644
--- a/lib/x509/verify.c
+++ b/lib/x509/verify.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/verify.h b/lib/x509/verify.h
index 9512a96c66..ebfc7577d4 100644
--- a/lib/x509/verify.h
+++ b/lib/x509/verify.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index a8dd2e9dd7..058c9c241b 100644
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/x509.h b/lib/x509/x509.h
index f80ad65c18..f7079d3f25 100644
--- a/lib/x509/x509.h
+++ b/lib/x509/x509.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/x509_write.c b/lib/x509/x509_write.c
index 453ca523c5..d3b7254767 100644
--- a/lib/x509/x509_write.c
+++ b/lib/x509/x509_write.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509/xml.c b/lib/x509/xml.c
index 8cb7c6075b..ef45f630e1 100644
--- a/lib/x509/xml.c
+++ b/lib/x509/xml.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509_b64.c b/lib/x509_b64.c
index f41cc1b454..93afd95d1d 100644
--- a/lib/x509_b64.c
+++ b/lib/x509_b64.c
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/lib/x509_b64.h b/lib/x509_b64.h
index 087c4919df..80a57d64f1 100644
--- a/lib/x509_b64.h
+++ b/lib/x509_b64.h
@@ -17,7 +17,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*
*/
diff --git a/libextra/Makefile.am b/libextra/Makefile.am
index 1ab5fb7771..90d9eb5336 100644
--- a/libextra/Makefile.am
+++ b/libextra/Makefile.am
@@ -16,9 +16,9 @@
# General Public License for more details.
#
# 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.
+# along with GNUTLS-EXTRA; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
AM_CPPFLAGS = -I$(top_srcdir)/crypto -I$(top_srcdir)/gl \
-I$(top_srcdir)/lib -I../includes -I$(top_srcdir)/includes \
diff --git a/libextra/gnutls_extra.c b/libextra/gnutls_extra.c
index 4f61f36dbb..cf95d2a093 100644
--- a/libextra/gnutls_extra.c
+++ b/libextra/gnutls_extra.c
@@ -16,9 +16,9 @@
* General Public License for more details.
*
* 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
+ * along with GNUTLS-EXTRA; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*
*/
diff --git a/libextra/gnutls_extra.h b/libextra/gnutls_extra.h
index 89a02827e0..92cc00c1da 100644
--- a/libextra/gnutls_extra.h
+++ b/libextra/gnutls_extra.h
@@ -16,9 +16,9 @@
* General Public License for more details.
*
* 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.
+ * along with GNUTLS-EXTRA; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*
*/
diff --git a/libextra/gnutls_openpgp.c b/libextra/gnutls_openpgp.c
index bea891347d..a3791c18ee 100644
--- a/libextra/gnutls_openpgp.c
+++ b/libextra/gnutls_openpgp.c
@@ -16,9 +16,9 @@
* General Public License for more details.
*
* 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
+ * along with GNUTLS-EXTRA; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*
*/
diff --git a/libextra/gnutls_openssl.c b/libextra/gnutls_openssl.c
index f67979ab27..e4dc9ccdd9 100644
--- a/libextra/gnutls_openssl.c
+++ b/libextra/gnutls_openssl.c
@@ -15,9 +15,9 @@
* General Public License for more details.
*
* 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.
+ * along with GNUTLS-EXTRA; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*
*/
diff --git a/libextra/lzoconf.h b/libextra/lzoconf.h
index 2fd911a53a..33a6147be8 100644
--- a/libextra/lzoconf.h
+++ b/libextra/lzoconf.h
@@ -24,7 +24,7 @@
You should have received a copy of the GNU General Public License
along with the LZO library; see the file COPYING.
If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Markus F.X.J. Oberhumer
<markus@oberhumer.com>
diff --git a/libextra/minilzo.c b/libextra/minilzo.c
index 134f4631f5..9aa3aac6af 100644
--- a/libextra/minilzo.c
+++ b/libextra/minilzo.c
@@ -24,7 +24,7 @@
You should have received a copy of the GNU General Public License
along with the LZO library; see the file COPYING.
If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Markus F.X.J. Oberhumer
<markus@oberhumer.com>
diff --git a/libextra/minilzo.h b/libextra/minilzo.h
index 3d1437d2db..348cbb9013 100644
--- a/libextra/minilzo.h
+++ b/libextra/minilzo.h
@@ -24,7 +24,7 @@
You should have received a copy of the GNU General Public License
along with the LZO library; see the file COPYING.
If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Markus F.X.J. Oberhumer
<markus@oberhumer.com>
diff --git a/libextra/opencdk/armor.c b/libextra/opencdk/armor.c
index f932766f82..e267ad1659 100644
--- a/libextra/opencdk/armor.c
+++ b/libextra/opencdk/armor.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*
*
* ChangeLog for basic BASE64 code (base64_encode, base64_decode):
diff --git a/libextra/opencdk/cipher.c b/libextra/opencdk/cipher.c
index cc4c6ce5c7..5d18c534c1 100644
--- a/libextra/opencdk/cipher.c
+++ b/libextra/opencdk/cipher.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/libextra/opencdk/cipher.h b/libextra/opencdk/cipher.h
index ab73f2824f..c18ff2c3c8 100644
--- a/libextra/opencdk/cipher.h
+++ b/libextra/opencdk/cipher.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef CDK_CIPHER_H
diff --git a/libextra/opencdk/compress.c b/libextra/opencdk/compress.c
index 4a8a5cd95c..2b530e2c0e 100644
--- a/libextra/opencdk/compress.c
+++ b/libextra/opencdk/compress.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/libextra/opencdk/context.h b/libextra/opencdk/context.h
index e4e42009b1..a78a0eecc8 100644
--- a/libextra/opencdk/context.h
+++ b/libextra/opencdk/context.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef CDK_CONTEXT_H
diff --git a/libextra/opencdk/encrypt.c b/libextra/opencdk/encrypt.c
index d3f71dad67..5fe69dbf42 100644
--- a/libextra/opencdk/encrypt.c
+++ b/libextra/opencdk/encrypt.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/libextra/opencdk/filters.h b/libextra/opencdk/filters.h
index 48c3c7c2f3..c68982326b 100644
--- a/libextra/opencdk/filters.h
+++ b/libextra/opencdk/filters.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef CDK_FILTERS_H
diff --git a/libextra/opencdk/kbnode.c b/libextra/opencdk/kbnode.c
index 72e941a043..a0f8dac317 100644
--- a/libextra/opencdk/kbnode.c
+++ b/libextra/opencdk/kbnode.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/* X-TODO-STATUS: OK */
diff --git a/libextra/opencdk/keydb.c b/libextra/opencdk/keydb.c
index 8ef73c1c47..010c7d77c0 100644
--- a/libextra/opencdk/keydb.c
+++ b/libextra/opencdk/keydb.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/libextra/opencdk/keygen.c b/libextra/opencdk/keygen.c
index c1f0ad1773..8931af1920 100644
--- a/libextra/opencdk/keygen.c
+++ b/libextra/opencdk/keygen.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/libextra/opencdk/keylist.c b/libextra/opencdk/keylist.c
index e42c3b92cc..70d976e4c6 100644
--- a/libextra/opencdk/keylist.c
+++ b/libextra/opencdk/keylist.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/libextra/opencdk/keyserver.c b/libextra/opencdk/keyserver.c
index 2b6baa8abe..d80bba8ee6 100644
--- a/libextra/opencdk/keyserver.c
+++ b/libextra/opencdk/keyserver.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/libextra/opencdk/main.c b/libextra/opencdk/main.c
index 8eafe3cfc0..c839b377cf 100644
--- a/libextra/opencdk/main.c
+++ b/libextra/opencdk/main.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifdef HAVE_CONFIG_H
@@ -183,13 +183,14 @@ _secmem_init (size_t size)
}
+/* Not used?
static void
_secmem_end (void)
{
gcry_control (GCRYCTL_TERM_SECMEM);
secmem_init = 0;
}
-
+*/
void *
cdk_salloc (size_t size, int clear)
diff --git a/libextra/opencdk/main.h b/libextra/opencdk/main.h
index 62f09d366e..d20b7d490b 100644
--- a/libextra/opencdk/main.h
+++ b/libextra/opencdk/main.h
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef CDK_MAIN_H
diff --git a/libextra/opencdk/md.c b/libextra/opencdk/md.c
index 189c5b3ce8..85b55701e9 100644
--- a/libextra/opencdk/md.c
+++ b/libextra/opencdk/md.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <stdio.h>
diff --git a/libextra/opencdk/md.h b/libextra/opencdk/md.h
index a57f57e2fe..2348b48ca8 100644
--- a/libextra/opencdk/md.h
+++ b/libextra/opencdk/md.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef CDK_MD_H
diff --git a/libextra/opencdk/misc.c b/libextra/opencdk/misc.c
index e5a323e291..b0c0e35a8b 100644
--- a/libextra/opencdk/misc.c
+++ b/libextra/opencdk/misc.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/libextra/opencdk/new-packet.c b/libextra/opencdk/new-packet.c
index 6251fbd2f6..2ac3ca8e05 100644
--- a/libextra/opencdk/new-packet.c
+++ b/libextra/opencdk/new-packet.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/libextra/opencdk/opencdk.h b/libextra/opencdk/opencdk.h
index b8476d34b5..83af3a94a7 100644
--- a/libextra/opencdk/opencdk.h
+++ b/libextra/opencdk/opencdk.h
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef OPENCDK_H
diff --git a/libextra/opencdk/packet.h b/libextra/opencdk/packet.h
index f8e83555f4..89f62eb5c8 100644
--- a/libextra/opencdk/packet.h
+++ b/libextra/opencdk/packet.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef CDK_PACKET_H
diff --git a/libextra/opencdk/plaintext.c b/libextra/opencdk/plaintext.c
index 29eacb2263..097bcc2c0d 100644
--- a/libextra/opencdk/plaintext.c
+++ b/libextra/opencdk/plaintext.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/libextra/opencdk/pubkey.c b/libextra/opencdk/pubkey.c
index 0b0b5cc6d9..679574b6f9 100644
--- a/libextra/opencdk/pubkey.c
+++ b/libextra/opencdk/pubkey.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/libextra/opencdk/read-packet.c b/libextra/opencdk/read-packet.c
index 10ef764bea..9bdc025855 100644
--- a/libextra/opencdk/read-packet.c
+++ b/libextra/opencdk/read-packet.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/libextra/opencdk/seskey.c b/libextra/opencdk/seskey.c
index 565eb1ac68..3b1e376a0f 100644
--- a/libextra/opencdk/seskey.c
+++ b/libextra/opencdk/seskey.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/libextra/opencdk/sig-check.c b/libextra/opencdk/sig-check.c
index e96c051587..f882c77967 100644
--- a/libextra/opencdk/sig-check.c
+++ b/libextra/opencdk/sig-check.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/libextra/opencdk/sign.c b/libextra/opencdk/sign.c
index 0a68c9f707..10f5830358 100644
--- a/libextra/opencdk/sign.c
+++ b/libextra/opencdk/sign.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/libextra/opencdk/stream.c b/libextra/opencdk/stream.c
index 14d73cd8a7..c158efe8d4 100644
--- a/libextra/opencdk/stream.c
+++ b/libextra/opencdk/stream.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/libextra/opencdk/stream.h b/libextra/opencdk/stream.h
index cbc575ed01..3d10891957 100644
--- a/libextra/opencdk/stream.h
+++ b/libextra/opencdk/stream.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; 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 CDK_STREAM_H
diff --git a/libextra/opencdk/sym-cipher.c b/libextra/opencdk/sym-cipher.c
index edcceac678..5405b89a16 100644
--- a/libextra/opencdk/sym-cipher.c
+++ b/libextra/opencdk/sym-cipher.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
diff --git a/libextra/opencdk/trustdb.c b/libextra/opencdk/trustdb.c
index cce5418324..36d89e7a56 100644
--- a/libextra/opencdk/trustdb.c
+++ b/libextra/opencdk/trustdb.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/libextra/opencdk/types.h b/libextra/opencdk/types.h
index ddccc3de26..6b313b71a7 100644
--- a/libextra/opencdk/types.h
+++ b/libextra/opencdk/types.h
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef CDK_TYPES_H
diff --git a/libextra/opencdk/verify.c b/libextra/opencdk/verify.c
index 23f9f08198..600b781ab5 100644
--- a/libextra/opencdk/verify.c
+++ b/libextra/opencdk/verify.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/libextra/opencdk/write-packet.c b/libextra/opencdk/write-packet.c
index 1ef2ba3ac3..537a2f3234 100644
--- a/libextra/opencdk/write-packet.c
+++ b/libextra/opencdk/write-packet.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with OpenCDK; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/libextra/openpgp/compat.c b/libextra/openpgp/compat.c
index bc530184b0..07a9d480ed 100644
--- a/libextra/openpgp/compat.c
+++ b/libextra/openpgp/compat.c
@@ -16,9 +16,9 @@
* General Public License for more details.
*
* 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
+ * along with GNUTLS-EXTRA; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*
*/
diff --git a/libextra/openpgp/extras.c b/libextra/openpgp/extras.c
index 46faf75914..fb31d052a1 100644
--- a/libextra/openpgp/extras.c
+++ b/libextra/openpgp/extras.c
@@ -16,9 +16,9 @@
* General Public License for more details.
*
* 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
+ * along with GNUTLS-EXTRA; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*
*/
diff --git a/libextra/openpgp/pgp.c b/libextra/openpgp/pgp.c
index 8e20b54bba..96fbd84fa5 100644
--- a/libextra/openpgp/pgp.c
+++ b/libextra/openpgp/pgp.c
@@ -16,9 +16,9 @@
* General Public License for more details.
*
* 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
+ * along with GNUTLS-EXTRA; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*
*/
diff --git a/libextra/openpgp/pgpverify.c b/libextra/openpgp/pgpverify.c
index 128100e380..46133252ba 100644
--- a/libextra/openpgp/pgpverify.c
+++ b/libextra/openpgp/pgpverify.c
@@ -16,9 +16,9 @@
* General Public License for more details.
*
* 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
+ * along with GNUTLS-EXTRA; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*
*/
diff --git a/libextra/openpgp/privkey.c b/libextra/openpgp/privkey.c
index fcc81ea4f3..48f02da9b6 100644
--- a/libextra/openpgp/privkey.c
+++ b/libextra/openpgp/privkey.c
@@ -16,9 +16,9 @@
* General Public License for more details.
*
* 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
+ * along with GNUTLS-EXTRA; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*
*/
diff --git a/libextra/openpgp/xml.c b/libextra/openpgp/xml.c
index 15d7e9eb27..8acee71c98 100644
--- a/libextra/openpgp/xml.c
+++ b/libextra/openpgp/xml.c
@@ -16,9 +16,9 @@
* General Public License for more details.
*
* 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
+ * along with GNUTLS-EXTRA; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*
*/
diff --git a/libextra/openssl_compat.c b/libextra/openssl_compat.c
index 18e5f0ff17..d4d6a8069b 100644
--- a/libextra/openssl_compat.c
+++ b/libextra/openssl_compat.c
@@ -16,9 +16,9 @@
* General Public License for more details.
*
* 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.
+ * along with GNUTLS-EXTRA; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*
*/
diff --git a/libextra/openssl_compat.h b/libextra/openssl_compat.h
index 20ad7b4cd0..a1c26e5db4 100644
--- a/libextra/openssl_compat.h
+++ b/libextra/openssl_compat.h
@@ -16,9 +16,9 @@
* General Public License for more details.
*
* 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.
+ * along with GNUTLS-EXTRA; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*
*/
diff --git a/src/Makefile.am b/src/Makefile.am
index 16bb1a84f9..7abe7a31bb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,22 @@
+## 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.
+#
+# 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.
+#
+# 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
+# General Public License for more details.
+#
+# 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.
+
EXTRA_DIST = README README.srptool gnutls-http-serv
SUBDIRS = srp x509 openpgp cfg
diff --git a/src/certtool-cfg.c b/src/certtool-cfg.c
index 8303502212..434eda6be6 100644
--- a/src/certtool-cfg.c
+++ b/src/certtool-cfg.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
*/
#include <config.h>
diff --git a/src/certtool.c b/src/certtool.c
index b0a99a25cc..6b1c2e15b3 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -17,7 +17,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
*/
#include <config.h>
diff --git a/src/cli.c b/src/cli.c
index 68566725d6..a9d0994fa7 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -16,7 +16,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
*/
#include <config.h>
diff --git a/src/common.c b/src/common.c
index aa8011752f..571aa48396 100644
--- a/src/common.c
+++ b/src/common.c
@@ -17,7 +17,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
*/
#include <config.h>
diff --git a/src/crypt.c b/src/crypt.c
index f9a22a0604..802e3d970b 100644
--- a/src/crypt.c
+++ b/src/crypt.c
@@ -17,7 +17,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
*/
#include <config.h>
diff --git a/src/list.h b/src/list.h
index 021591fea7..1768f9e948 100644
--- a/src/list.h
+++ b/src/list.h
@@ -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
*/
/*
diff --git a/src/prime.c b/src/prime.c
index e53f9392a8..432eb631c4 100644
--- a/src/prime.c
+++ b/src/prime.c
@@ -16,7 +16,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
*/
#include <config.h>
diff --git a/src/serv.c b/src/serv.c
index 68cd30d654..6b322ea2a2 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -17,7 +17,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
*/
/* This server is heavily modified for GNUTLS by Nikos Mavroyanopoulos
diff --git a/src/tests.c b/src/tests.c
index 85e5f5f82e..081ac028f8 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -16,7 +16,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
*/
#include <config.h>
diff --git a/src/tls_test.c b/src/tls_test.c
index 363aa0d413..26c611d879 100644
--- a/src/tls_test.c
+++ b/src/tls_test.c
@@ -16,7 +16,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
*/
#include <config.h>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 800bc861eb..0463bc5d13 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,19 +5,19 @@
#
# This file is part of GNUTLS.
#
-# GNUTLS 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 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.
#
-# GNUTLS 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
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with GNUTLS; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 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 = -I../includes -I$(top_srcdir)/includes
AM_LDFLAGS = -no-install
diff --git a/tests/anonself.c b/tests/anonself.c
index d1ecfe06e5..6a1aa6a885 100644
--- a/tests/anonself.c
+++ b/tests/anonself.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with GNUTLS; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/* Parts copied from GnuTLS example programs. */
diff --git a/tests/chain b/tests/chain
index 33415db9c8..061fca8fa1 100755
--- a/tests/chain
+++ b/tests/chain
@@ -18,7 +18,7 @@
#
# You should have received a copy of the GNU General Public License
# along with GNUTLS; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
CERTTOOL=../src/certtool
diff --git a/tests/openssl.c b/tests/openssl.c
index 9d5cced195..cc98a67a22 100644
--- a/tests/openssl.c
+++ b/tests/openssl.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with GNUTLS; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/tests/pkcs12_neon b/tests/pkcs12_neon
index 8890230056..6aa5983dbe 100755
--- a/tests/pkcs12_neon
+++ b/tests/pkcs12_neon
@@ -18,7 +18,7 @@
#
# You should have received a copy of the GNU General Public License
# along with GNUTLS; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
CERTTOOL=../src/certtool
diff --git a/tests/pkits b/tests/pkits
index cd937d3704..943e4af61d 100755
--- a/tests/pkits
+++ b/tests/pkits
@@ -16,7 +16,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
echo "Running PKITS CRL..."
./pkits_crl
diff --git a/tests/pkits_crl b/tests/pkits_crl
index 04a5e13ee4..1543abb761 100755
--- a/tests/pkits_crl
+++ b/tests/pkits_crl
@@ -16,7 +16,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
CERTTOOL=../src/certtool
diff --git a/tests/pkits_crt b/tests/pkits_crt
index 0abc9340d2..de07f78db2 100755
--- a/tests/pkits_crt
+++ b/tests/pkits_crt
@@ -16,7 +16,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
CERTTOOL=../src/certtool
diff --git a/tests/pkits_pkcs12 b/tests/pkits_pkcs12
index ed6f010dc4..43cd42a305 100755
--- a/tests/pkits_pkcs12
+++ b/tests/pkits_pkcs12
@@ -16,7 +16,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
CERTTOOL=../src/certtool
diff --git a/tests/pkits_smime b/tests/pkits_smime
index c2f4560b24..28c7499c58 100755
--- a/tests/pkits_smime
+++ b/tests/pkits_smime
@@ -16,7 +16,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
CERTTOOL=../src/certtool
diff --git a/tests/simple.c b/tests/simple.c
index ccf681987c..1d882f381e 100644
--- a/tests/simple.c
+++ b/tests/simple.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with GNUTLS; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/tests/utils.c b/tests/utils.c
index ca1587a126..0b606587fc 100644
--- a/tests/utils.c
+++ b/tests/utils.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with GNUTLS; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/tests/utils.h b/tests/utils.h
index aa4f718333..4892469343 100644
--- a/tests/utils.h
+++ b/tests/utils.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with GNUTLS; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef UTILS_H