diff --git a/AUTHORS b/AUTHORS index a7d544d2f..a0e3d6cbc 100644 --- a/AUTHORS +++ b/AUTHORS @@ -50,6 +50,8 @@ Laurentiu Buzdugan Translations [ro] Magda Procha'zkova' Translations [cs] +Meng Jie Translations [zh_CN] + Michael Roth Assigns changes. (wrote cipher/des.c., changes and bug fixes all over the place) @@ -94,7 +96,8 @@ Rafael Caetano dos Santos Translations [pt_BR] Toomas Soome Translations [et] -Urko Lusa Translations [es_ES] +Urko Lusa Translations [es] +Jaime Sua'rez Translations [es] Walter Koch Translations [de] diff --git a/COPYING b/COPYING index d60c31a97..3912109b5 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. @@ -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) year 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/ChangeLog b/ChangeLog index 1c611141c..7a0859e2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-05-31 Werner Koch + + Released 1.4.2rc1. + + * README: Add a note on GnuPG 1.9. + + Updated FSF address in all files. + 2005-05-26 David Shaw * NEWS: Note command completion and the new curl-based HKP helper. diff --git a/Makefile.am b/Makefile.am index 22ff33b83..3f1d670b8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,7 +14,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 ## Process this file with automake to produce Makefile.in diff --git a/NEWS b/NEWS index 245e62915..602f988ac 100644 --- a/NEWS +++ b/NEWS @@ -4,13 +4,13 @@ Noteworthy changes in version 1.4.2 * New command "verify" in the card-edit menu to display the Private-DO-3. The Admin command has been enhanced to take the optional arguments "on", "off" and "verify". The latter may - be used to verify the ADmin Pin without modifying data; this - allows displayin the Private-DO-4 with the "list" command. + be used to verify the Admin Pin without modifying data; this + allows displaying the Private-DO-4 with the "list" command. * Rewrote large parts of the card code to optionally make use of a running gpg-agent. If --use-agent is being used and a gpg-agent with enabled scdaemon is active, gpg will now divert all card - operations to that daemon. This is required because bot, + operations to that daemon. This is required because both, scdaemon and gpg require exclusive access to the card reader. By delegating the work to scdaemon, both can peacefully coexist and scdaemon is able to control the use of the reader. Note that @@ -817,7 +817,7 @@ Noteworthy changes in version 1.0.5 (2001-04-29) * Large File Support (LFS) is now working. * New options: --ignore-crc-error, --no-sig-create-check, - --no-sig-cache, --fixed_list_mode, --no-expensive-trust-checks, + --no-sig-cache, --fixed-list-mode, --no-expensive-trust-checks, --enable-special-filenames and --use-agent. See man page. * New command --pipemode, which can be used to run gpg as a diff --git a/README b/README index 9d9c8a319..967b2580c 100644 --- a/README +++ b/README @@ -735,6 +735,20 @@ rpm in /usr/src/redhat/SRPMS + + GnuPG 1.4 and GnuPG 1.9 + ----------------------- + GnuPG 1.4 is the stable version of GnuPG; GnuPG 1.9 is the + development branch. However, large parts of GnuPG 1.9 are also + considered to be stable and useful. In particular the tools + "gpg-agent" (private key operations and passphrase caching) and + "gpgsm" (S/MIME cousin of "gpg") are considered stable. Both + packages (1.4.x and 1.9.x) may be installed at the same time and + it is actually suggested to do this if you need S/MIME support or + want to make use of gpg-agent. + + + How to Get More Information --------------------------- @@ -750,10 +764,17 @@ gnupg-announce@gnupg.org For important announcements like new versions and such stuff. This is a moderated list and has - very low traffic. + very low traffic. Do not post to + this list. gnupg-users@gnupg.org For general user discussion and - help. + help (English). + + gnupg-de@gnupg.org German speaking counterpart of + gnupg-users. + + gnupg-ru@gnupg.org Russian speaking counterpart of + gnupg-users. gnupg-devel@gnupg.org GnuPG developers main forum. @@ -768,9 +789,10 @@ Please direct questions about GnuPG to the users mailing list or one of the pgp newsgroups; please do not direct questions to one - of the authors directly as we are busy working on improvements - and bug fixes. Both mailing lists are watched by the authors - and we try to answer questions when time allows us to do so. + of the authors directly as we are busy working on improvements and + bug fixes. The English and German mailing lists are watched by + the authors and we try to answer questions when time allows us to + do so. Commercial grade support for GnuPG is available; please see the GNU service directory or check out http://g10code.com. diff --git a/THANKS b/THANKS index 6958e5e05..231aa96c3 100644 --- a/THANKS +++ b/THANKS @@ -171,6 +171,7 @@ Reinhard Wobst R.Wobst@ifw-dresden.de Rémi Guyomarch rguyom@mail.dotcom.fr Reuben Sumner rasumner@wisdom.weizmann.ac.il Richard Outerbridge outer@interlog.com +Richard Patterson vectro@yahoo.com Robert Joop rj@rainbow.in-berlin.de Roddy Strachan roddy@satlink.com.au Roger Sondermann r.so@bigfoot.com diff --git a/TODO b/TODO index a6aff8e49..b1f9edf49 100644 --- a/TODO +++ b/TODO @@ -6,11 +6,6 @@ 20% faster and the crc32 code about 50% faster. Some memory leaks were also fixed according to the ChangeLog. - * Do we need a configure test for putenv? - - * Describe some pitfalls when using EGD. Check that ~/.gnupg/entropy - really is the default. What about needed permission? - * Using an expired key for signing should give an error message "expired key" and not "unusable key'. Furthermore the error should also be thrown when the default key has expired. Reported by @@ -48,11 +43,6 @@ * Add a way to show the fingerprint of an key signator's keys - * Add an is_valid flag to each user ID. - - * Replace the printing of the user name by [self-signature] when - appropriate so that a key listing does not get clobbered. - * Concatenated encryption messages don't work corectly - only the first one is processed. @@ -61,14 +51,8 @@ * --disable-asm should still assemble _udiv_qrnnd when needed - * Get new assembler stuff from gmp 3.1 - * add test cases for invalid data (scrambled armor or other random data) - * add checking of armor trailers. Try to detect garbled header - lines. Often one dash is missing due to sloppy cut+paste; so add - a warning note like the one for QP. - * the pubkey encrypt functions should do some sanity checks. * "gpg filename.tar.gz.asc" should work like --verify (-sab). @@ -87,11 +71,6 @@ * keyflags don't distinguish between {certify,signature}-only. - * Instead of issuing a "signature packet without keyid" gpg should - try to get the keyID from a corresponding one-pass signature - packet (See bug report 817). This is not easy to do as we don't - store the one-pass packets. - * cat foo | gpg --sign | gpg --list-packets Does not list the signature packet. @@ -102,18 +81,4 @@ * Add the NEWSIG status. - * When generating a key on the card we should try to also set the - display name or provide the display name as a default in the key - generation. The problem however is that the display name must be - given with an indication of the surname and the usable characters - are also restricted. - * Delete a card key as well as a wiping. - - -Things we won't do ------------------- - - * New option --file-remove path-to-wipe-program ? - - diff --git a/acinclude.m4 b/acinclude.m4 index 2dcf25aba..97ed3ea0d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -15,7 +15,7 @@ dnl GNU General Public License for more details. dnl dnl You should have received a copy of the GNU General Public License dnl along with this program; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA +dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA dnl GNUPG_MSG_PRINT(STRING) dnl print a message diff --git a/checks/Makefile.am b/checks/Makefile.am index 88918ee9b..d240b955b 100644 --- a/checks/Makefile.am +++ b/checks/Makefile.am @@ -14,7 +14,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 # Process this file with automake to create Makefile.in diff --git a/cipher/Makefile.am b/cipher/Makefile.am index 85b0a47dd..12c4bb0b5 100644 --- a/cipher/Makefile.am +++ b/cipher/Makefile.am @@ -14,7 +14,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 ## Process this file with automake to produce Makefile.in diff --git a/cipher/algorithms.h b/cipher/algorithms.h index 36fc8442e..8c125611c 100644 --- a/cipher/algorithms.h +++ b/cipher/algorithms.h @@ -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 GNUPG_ALGORITHMS_H #define GNUPG_ALGORITHMS_H 1 diff --git a/cipher/bithelp.h b/cipher/bithelp.h index d6eae8edf..64209bacd 100644 --- a/cipher/bithelp.h +++ b/cipher/bithelp.h @@ -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 G10_BITHELP_H #define G10_BITHELP_H diff --git a/cipher/blowfish.c b/cipher/blowfish.c index 8d359da05..1a1ce5678 100644 --- a/cipher/blowfish.c +++ b/cipher/blowfish.c @@ -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. * * For a description of the algorithm, see: * Bruce Schneier: Applied Cryptography. John Wiley & Sons, 1996. diff --git a/cipher/cast5.c b/cipher/cast5.c index efa4e0e3e..043aa7aed 100644 --- a/cipher/cast5.c +++ b/cipher/cast5.c @@ -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. */ /* Test vectors: diff --git a/cipher/cipher.c b/cipher/cipher.c index b3bd6688f..950f625cf 100644 --- a/cipher/cipher.c +++ b/cipher/cipher.c @@ -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. */ #include diff --git a/cipher/des.c b/cipher/des.c index f4cba21dc..6ad799395 100644 --- a/cipher/des.c +++ b/cipher/des.c @@ -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. * * * According to the definition of DES in FIPS PUB 46-2 from December 1993. diff --git a/cipher/dsa.c b/cipher/dsa.c index b1543c049..1fdb29ae4 100644 --- a/cipher/dsa.c +++ b/cipher/dsa.c @@ -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. */ #include diff --git a/cipher/dsa.h b/cipher/dsa.h index 97e14e2b3..6902b548c 100644 --- a/cipher/dsa.h +++ b/cipher/dsa.h @@ -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 G10_DSA_H diff --git a/cipher/dynload.c b/cipher/dynload.c index 38c6a0c35..3f0e2b720 100644 --- a/cipher/dynload.c +++ b/cipher/dynload.c @@ -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. */ #include diff --git a/cipher/elgamal.c b/cipher/elgamal.c index eb69a655c..95ff38ccc 100644 --- a/cipher/elgamal.c +++ b/cipher/elgamal.c @@ -20,7 +20,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. */ #include diff --git a/cipher/elgamal.h b/cipher/elgamal.h index 6c8184219..416f49cc5 100644 --- a/cipher/elgamal.h +++ b/cipher/elgamal.h @@ -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 G10_ELGAMAL_H diff --git a/cipher/gost.c b/cipher/gost.c index 4a527722f..1b6be38c5 100644 --- a/cipher/gost.c +++ b/cipher/gost.c @@ -19,7 +19,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. */ #include diff --git a/cipher/gost.h b/cipher/gost.h index d8e7ebfc5..bbe8bc522 100644 --- a/cipher/gost.h +++ b/cipher/gost.h @@ -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 G10_GOST_H #define G10_GOST_H diff --git a/cipher/idea-stub.c b/cipher/idea-stub.c index 539c9bb58..fc19baeed 100644 --- a/cipher/idea-stub.c +++ b/cipher/idea-stub.c @@ -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. */ /* IDEA is a patented algorithm and therefore the use of IDEA in diff --git a/cipher/md.c b/cipher/md.c index 1821882e9..66a8b0540 100644 --- a/cipher/md.c +++ b/cipher/md.c @@ -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. */ #include diff --git a/cipher/md5.c b/cipher/md5.c index 631df17eb..270e3fe3e 100644 --- a/cipher/md5.c +++ b/cipher/md5.c @@ -14,7 +14,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. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * According to the definition of MD5 in RFC 1321 from April 1992. * NOTE: This is *not* the same file as the one from glibc. diff --git a/cipher/primegen.c b/cipher/primegen.c index dda9012b5..98d63696a 100644 --- a/cipher/primegen.c +++ b/cipher/primegen.c @@ -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. * * *********************************************************************** * The algorithm used to generate practically save primes is due to diff --git a/cipher/pubkey.c b/cipher/pubkey.c index b74b17bae..d6d1ff1f2 100644 --- a/cipher/pubkey.c +++ b/cipher/pubkey.c @@ -16,7 +16,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. */ #include diff --git a/cipher/rand-internal.h b/cipher/rand-internal.h index ab01bc6db..cb398877a 100644 --- a/cipher/rand-internal.h +++ b/cipher/rand-internal.h @@ -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 G10_RAND_INTERNAL_H #define G10_RAND_INTERNAL_H diff --git a/cipher/random.c b/cipher/random.c index baee65c49..0aa75cda4 100644 --- a/cipher/random.c +++ b/cipher/random.c @@ -16,7 +16,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. */ diff --git a/cipher/random.h b/cipher/random.h index f4ba918bd..08d1e2ddd 100644 --- a/cipher/random.h +++ b/cipher/random.h @@ -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 G10_RANDOM_H #define G10_RANDOM_H diff --git a/cipher/rijndael.c b/cipher/rijndael.c index 083b10399..adf276531 100644 --- a/cipher/rijndael.c +++ b/cipher/rijndael.c @@ -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. ******************************************************************* * The code here is based on the optimized implementation taken from * http://www.esat.kuleuven.ac.be/~rijmen/rijndael/ on Oct 2, 2000, diff --git a/cipher/rmd.h b/cipher/rmd.h index 917e04a26..1313bb78b 100644 --- a/cipher/rmd.h +++ b/cipher/rmd.h @@ -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 G10_RMD_H #define G10_RMD_H diff --git a/cipher/rmd160.c b/cipher/rmd160.c index 6f4f5664c..7a7230f38 100644 --- a/cipher/rmd160.c +++ b/cipher/rmd160.c @@ -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. */ #include diff --git a/cipher/rmd160test.c b/cipher/rmd160test.c index 49f948989..94912269b 100644 --- a/cipher/rmd160test.c +++ b/cipher/rmd160test.c @@ -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. */ #include diff --git a/cipher/rndegd.c b/cipher/rndegd.c index df31ce189..f2e2a020a 100644 --- a/cipher/rndegd.c +++ b/cipher/rndegd.c @@ -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. */ #include diff --git a/cipher/rndlinux.c b/cipher/rndlinux.c index 1284bc7ee..ca42eea8a 100644 --- a/cipher/rndlinux.c +++ b/cipher/rndlinux.c @@ -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. */ diff --git a/cipher/rndriscos.c b/cipher/rndriscos.c index a0fbbc228..5565e1fee 100644 --- a/cipher/rndriscos.c +++ b/cipher/rndriscos.c @@ -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. */ #include diff --git a/cipher/rndw32.c b/cipher/rndw32.c index 28602fd5f..b59ae6fbe 100644 --- a/cipher/rndw32.c +++ b/cipher/rndw32.c @@ -16,7 +16,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. * ************************************************************************* * The code here is based on code from Cryptlib 3.0 beta by Peter Gutmann. diff --git a/cipher/rsa.c b/cipher/rsa.c index e41ff2481..f23f3fcaa 100644 --- a/cipher/rsa.c +++ b/cipher/rsa.c @@ -16,7 +16,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. */ /* This code uses an algorithm protected by U.S. Patent #4,405,829 diff --git a/cipher/rsa.h b/cipher/rsa.h index 13c6e92e4..e6ea42356 100644 --- a/cipher/rsa.h +++ b/cipher/rsa.h @@ -16,7 +16,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 G10_RSA_H diff --git a/cipher/sha1.c b/cipher/sha1.c index f5f223feb..d150fad1e 100644 --- a/cipher/sha1.c +++ b/cipher/sha1.c @@ -17,7 +17,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. */ diff --git a/cipher/sha256.c b/cipher/sha256.c index b71025ecb..47c754101 100644 --- a/cipher/sha256.c +++ b/cipher/sha256.c @@ -17,7 +17,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. */ diff --git a/cipher/sha512.c b/cipher/sha512.c index ed67fe45a..523579d25 100644 --- a/cipher/sha512.c +++ b/cipher/sha512.c @@ -17,7 +17,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. */ diff --git a/cipher/smallprime.c b/cipher/smallprime.c index 941f4ce9a..b110fbbd1 100644 --- a/cipher/smallprime.c +++ b/cipher/smallprime.c @@ -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. */ #include diff --git a/configure.ac b/configure.ac index b61b8dbde..42b964dbd 100644 --- a/configure.ac +++ b/configure.ac @@ -16,17 +16,17 @@ dnl GNU General Public License for more details. dnl dnl You should have received a copy of the GNU General Public License dnl along with this program; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA +dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +dnl MA 02110-1301, USA dnl dnl (Process this file with autoconf to produce a configure script.) -dnlAC_REVISION($Revision$)dnl AC_PREREQ(2.59) min_automake_version="1.9.3" # Remember to change the version number immediately *after* a release # and remove the "-cvs" or "rc" suffix immediately *before* a release. -AC_INIT(gnupg, 1.4.2-cvs, bug-gnupg@gnu.org) +AC_INIT(gnupg, 1.4.2rc1, bug-gnupg@gnu.org) # Set development_version to yes if the minor number is odd or you # feel that the default check for a development version is not # sufficient. diff --git a/doc/Makefile.am b/doc/Makefile.am index dc421aa5e..34b9ddf65 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -14,7 +14,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 ## Process this file with automake to create Makefile.in diff --git a/doc/README.W32 b/doc/README.W32 index 5f09e0806..a82e63861 100644 --- a/doc/README.W32 +++ b/doc/README.W32 @@ -134,8 +134,8 @@ GnuPG is 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 See the files AUTHORS and THANKS for credits, further legal information and bug reporting addresses pertaining to GnuPG. diff --git a/doc/faq.raw b/doc/faq.raw index 2369fd977..cbab76b0c 100644 --- a/doc/faq.raw +++ b/doc/faq.raw @@ -1338,7 +1338,7 @@ you could search in the mailing list archive. [H hr] Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc., -59 Temple Place - Suite 330, Boston, MA 02111, USA +51 Franklin Street, Fifth Floor, Boston, MA 02111, USA Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. diff --git a/doc/fr/FAQ b/doc/fr/FAQ index 48c28ae76..b15da515b 100644 --- a/doc/fr/FAQ +++ b/doc/fr/FAQ @@ -1105,7 +1105,7 @@ avoir fourni le script permettant de générer cette FAQ, qu'il utilise d'autre part pour son excellente FAQ Solaris2 ;-) Copyright (C) 2000 Free Software Foundation, Inc. , -59 Temple Place - Suite 330, Boston, MA 02111, USA +51 Franklin Street, Fifth Floor, Boston, MA 02111, USA Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. diff --git a/doc/gpg.ru.sgml b/doc/gpg.ru.sgml index 2d23dd953..5c7be9c78 100644 --- a/doc/gpg.ru.sgml +++ b/doc/gpg.ru.sgml @@ -18,7 +18,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 -->