diff options
72 files changed, 603 insertions, 616 deletions
@@ -1,3 +1,8 @@ +Tue Feb 24 15:59:12 1998 Werner Koch (wk@isil.d.shuttle.de) + + * configure.in: Changed the name of the package to GNUPG and + chnaged several other names too. + Wed Feb 18 17:36:45 1998 Werner Koch (wk@isil.d.shuttle.de) * Makefile.am (checks): New. @@ -1,8 +1,8 @@ Please read the Basic Installation section somewhere below. -Configure options for G10 -========================= +Configure options for GNUPG +=========================== --with-zlib Forces usage of the local zlib sources. Default is to use the (sahred) library of the system. @@ -37,11 +37,10 @@ Don't forget to delete "config.cache" and run "./config.status --recheck". Installation ============ -G10 is not installed as suid:root; if you want to use it, do it manually -(only g10, not g10maint). +pgp is not installed as suid:root; if you want to do it, do it manually. -You have to create the ~/.g10 directory manually. Your first action after -this should be to create a key pair: "g10 --gen-key". +The ~/.gpg directory will be created if it does not exist. Your first +action should be to create a key pair: "gpg --gen-key". @@ -1,6 +1,6 @@ - G10 - The GNU Encryption and Signing Tool - ------------------------------------------ + GNUPG - The GNU Privacy Guard + ------------------------------- THIS IS ALPHA SOFTWARE, EXPECT BUGS AND UNIMPLEMENTED STUFF. IT MAY HAPPEN THAT SOME DATA FORMATS OR PROGRAMM OPTIONS @@ -8,16 +8,16 @@ On a Linux box (version 2.x.x, alpha or x86 CPU) it should work reliable. You may create your key on such a machine and - use it. Please verify the tar file; there is a PGP and a G10 + use it. Please verify the tar file; there is a PGP and a GNUPG signature available. My PGP key is well known and published in the "Global Trust Register for 1998", ISBN 0-9532397-0-5. - I have included my pubring as "g10/pubring.10", which contains - the key used to make G10 signatures: + I have included my pubring as "g10/pubring.asc", which contains + the key used to make GNUPG signatures: "pub 1312G/FF3EAA0B 1998-02-09 Werner Koch <wk@isil.d.shuttle.de>" "Key fingerprint = 8489 6CD0 1851 0E33 45DA CD67 036F 11B8 FF3E AA0B" - You may add it to your G10 pubring and use it in the future to + You may add it to your GNUPG pubring and use it in the future to verify new releases. Because you verified the tar file containing this file here, you can be sure that the above fingerprint is correct. @@ -27,20 +27,20 @@ See the file COPYING for copyright and warranty information. - Due to the fact that G10 does not use use any patented algorithm, + Due to the fact that GNUPG does not use use any patented algorithm, it cannot be compatible to old PGP versions, because those use IDEA (which is worldwide patented) and RSA (which is patented in the United States until Sep 20, 2000). I'm sorry about this, but this is the world we have created (e.g. by using proprietary software). - Because the OpenPGP standard is still a draft, G10 is not yet + Because the OpenPGP standard is still a draft, GNUPG is not yet compatible to it (or PGP 5) - but it will. The data structures used are compatible with PGP 2.x, so it can parse an list such files - and PGP should be able to parse data created by G10 and complain + and PGP should be able to parse data created by GNUPG and complain about unsupported algorithms. - The default algorithms used by G10 are ElGamal for public-key + The default algorithms used by GNUPG are ElGamal for public-key encryption and signing; Blowfish with a 160 bit key for protecting the secret-key components, conventional and session encryption; RIPE MD-160 to create message digest. DSA, SHA-1 and CAST are @@ -61,19 +61,16 @@ 3) "make install" - 4) You end up with a binary "g10" in /usr/local/bin - - 5) Optional, but suggested: install the program "g10" as suid root. - - 6) Create a directory ".g10" under your home directory ("mkdir ~/.g10") + 4) You end up with a binary "gpg" in /usr/local/bin + 5) Optional, but suggested: install the program "gpg" as suid root. Key Generation -------------- - g10 --gen-key + gpg --gen-key This asks some questions and then starts key generation. To create good random numbers for prime number generation, it uses a /dev/random @@ -112,7 +109,7 @@ You should make a revocation certificate in cases someone gets knowledge of your secret key or you forgot your passphrase: - g10 --gen-revoke your_user_id + gpg --gen-revoke your_user_id Run this command and store it away; output is always ASCII armored, so that you can print it and (hopefully never) re-create it if @@ -121,11 +118,11 @@ You can sign a key with this command: - g10 --sign-key Donald + gpg --sign-key Donald This let you sign the key of "Donald" with your default userid. - g10 --sign-key -u Karl -u Joe Donald + gpg --sign-key -u Karl -u Joe Donald This let you sign the key of of "Donald" with the userids of "Karl" and "Joe". @@ -142,16 +139,16 @@ Sign ---- - g10 -s file + gpg -s file - This creates a file file.g10 which is compressed and has a signature + This creates a file file.gpg which is compressed and has a signature attached. - g10 -sa file + gpg -sa file - Same as above, but file.g10 is ascii armored. + Same as above, but file.gpg is ascii armored. - g10 -s -o out file + gpg -s -o out file Creates a signature of file, but writes the output to the file "out". @@ -159,12 +156,12 @@ Encrypt ------- - g10 -e -r heine file + gpg -e -r heine file This encrypts files with the public key of "heine" and writes it - to "file.g10" + to "file.gpg" - echo "hallo" | g10 -ea -r heine | mail heine + echo "hallo" | gpg -ea -r heine | mail heine Ditto, but encrypts "hallo\n" and mails it as ascii armored message. @@ -172,13 +169,13 @@ Sign and Encrypt ---------------- - g10 -se -r heine file + gpg -se -r heine file This encrypts files with the public key of "heine" and writes it - to "file.g10" after signing it with the default user id. + to "file.gpg" after signing it with the default user id. - g10 -se -r heine -u Suttner file + gpg -se -r heine -u Suttner file Ditto, but sign the file with the user id "Suttner" @@ -187,17 +184,17 @@ ------------------ To export your complete keyring(s) do this: - g10 --export + gpg --export To export only some user ids do this: - g10 --export userids + gpg --export userids Use "-a" or "--armor" to create ASCII armored output. Importing keys is done with the option, you guessed it, "--import": - g10 --import [filenames] + gpg --import [filenames] New keys are appended to the default keyring and already existing keys are merged. Keys without a self-signature are ignored. @@ -243,7 +240,7 @@ "#34" This can be used by a MUA to specify an exact key after selecting - a key from G10 (by the use of a special option or an extra utility) + a key from GNUPG (by the use of a special option or an extra utility) * Or by the usual substring: @@ -258,19 +255,19 @@ Batch mode ---------- - If you use the option "--batch", G10 runs in non-interactive mode and + If you use the option "--batch", GNUPG runs in non-interactive mode and never prompts for input data. This even does not allow to enter passphrase; until we have a better solution (something like ssh-agent), you can use the option "--passhrase-fd n", which works like PGPs PGPPASSFD. - Batch mode also causes G10 to terminate as soon as a BAD signature is + Batch mode also causes GNUPG to terminate as soon as a BAD signature is detected. Exit status ----------- - G10 returns with an exit status of 1 if in batch mode and a bad signature + GNUPG returns with an exit status of 1 if in batch mode and a bad signature has been detected or 2 or higher for all other errors. You should parse stderr to get detailed informations about the errors. @@ -278,26 +275,26 @@ Esoteric commands ----------------- - g10 --list-packets datafile + gpg --list-packets datafile Use this to list the contents of a data file. If the file is encrypted - you are asked for the passphrase, so that G10 is able to look at the + you are asked for the passphrase, so that GNUPG is able to look at the inner structure of a encrypted packet. - g10maint --quick-random + gpgm --quick-random Do not use the stroing random generator but a faster one. This can be used to generate keys for tests; those are marked as insecure. - g10maint --list-trustdb + gpgm --list-trustdb List the contents of the trustdb in a human readable format - g10maint --list-trustdb <usernames> + gpgm --list-trustdb <usernames> List the tree of certificates for the given usernames - g10maint --list-trust-path depth username + gpgm --list-trust-path depth username List the possible trust paths for the given username, up to the specified depth. If depth is negative, duplicate introducers are not listed, @@ -306,25 +303,25 @@ using a negative number). This option may create new entries in the trustdb. - g10maint --print-mds filenames + gpgm --print-mds filenames List all available message digest values for the fiven filenames - g10maint --gen-prime n + gpgm --gen-prime n Generate and print a simple prime number of size n - g10maint --gen-prime n q + gpgm --gen-prime n q Generate a prime number suitable for ElGamal signatures of size n with a q as largest primefactor of n-1. - g10maint --gen-prime n q 1 + gpgm --gen-prime n q 1 Ditto, but calculate a generator too. - For more options/commands see the file g10/OPTIONS, or use "g10 --help" + For more options/commands see the file g10/OPTIONS, or use "gpg --help" Debug Flags @@ -354,12 +351,12 @@ but for now I stick to my own formatting rules. The primary FTP site is "ftp://ftp.guug.de/pub/gcrypt/" - The primary WWW page is "http://www.d.shuttle.de/isil/crypt/g10.html" + The primary WWW page is "http://www.d.shuttle.de/isil/crypt/gnupg.html" - If you like, send your keys to <g10-keys@isil.d.shuttle.de>; use - "g10 --export --armor | mail g10-keys@isil.d.shuttle.de" to do this. + If you like, send your keys to <gnupg-keys@isil.d.shuttle.de>; use + "gnupg --export --armor | mail gnupg-keys@isil.d.shuttle.de" to do this. - Please direct bug reports to <g10-bugs@isil.d.shuttle.de> or better + Please direct bug reports to <gnupg-bugs@isil.d.shuttle.de> or better post them to the mailing list <g10@net.lut.ac.uk>. @@ -1,14 +1,14 @@ /* acconfig.h - used by autoheader to make config.h.in - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/cipher/ChangeLog b/cipher/ChangeLog index 29626e55..8454706d 100644 --- a/cipher/ChangeLog +++ b/cipher/ChangeLog @@ -1,3 +1,8 @@ +Tue Feb 24 12:28:42 1998 Werner Koch (wk@isil.d.shuttle.de) + + * md5.c, md.5 : Replaced by a modified version of md5.c from + GNU textutils 1.22. + Wed Feb 18 14:08:30 1998 Werner Koch (wk@isil.d.shuttle.de) * md.c, md.h : New debugging support diff --git a/cipher/blowfish.c b/cipher/blowfish.c index 8e3a4930..c0979b8c 100644 --- a/cipher/blowfish.c +++ b/cipher/blowfish.c @@ -1,18 +1,18 @@ /* blowfish.c - Blowfish encryption - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * * For a description of the algorithm, see: * Bruce Schneier: Applied Cryptography. John Wiley & Sons, 1996. * ISBN 0-471-11709-9. Pages 336 ff. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/cipher/blowfish.h b/cipher/blowfish.h index 3b01f526..998bc0c0 100644 --- a/cipher/blowfish.h +++ b/cipher/blowfish.h @@ -1,14 +1,14 @@ /* blowfish.h - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/cipher/cast5.c b/cipher/cast5.c index ef6c220a..4d6d8408 100644 --- a/cipher/cast5.c +++ b/cipher/cast5.c @@ -1,14 +1,14 @@ /* cast5.c - CAST5 cipher (RFC2144) - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/cipher/cast5.h b/cipher/cast5.h index 6e0b795f..12511282 100644 --- a/cipher/cast5.h +++ b/cipher/cast5.h @@ -1,14 +1,14 @@ /* cast5.h - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/cipher/dsa.c b/cipher/dsa.c index 9d0a018a..07f9e707 100644 --- a/cipher/dsa.c +++ b/cipher/dsa.c @@ -1,14 +1,14 @@ /* dsa.c - DSA signature scheme - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/cipher/dsa.h b/cipher/dsa.h index 7ed38a4b..1574560f 100644 --- a/cipher/dsa.h +++ b/cipher/dsa.h @@ -1,14 +1,14 @@ /* dsa.h - DSA signature scheme - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/cipher/elgamal.c b/cipher/elgamal.c index 6defbc5f..2141db0c 100644 --- a/cipher/elgamal.c +++ b/cipher/elgamal.c @@ -1,18 +1,18 @@ /* elgamal.c - ElGamal Public Key encryption - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * * For a description of the algorithm, see: * Bruce Schneier: Applied Cryptography. John Wiley & Sons, 1996. * ISBN 0-471-11709-9. Pages 476 ff. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/cipher/elgamal.h b/cipher/elgamal.h index 26af1a00..d253fbd9 100644 --- a/cipher/elgamal.h +++ b/cipher/elgamal.h @@ -1,14 +1,14 @@ /* elgamal.h - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/cipher/gost.c b/cipher/gost.c index b890bc5e..04f49261 100644 --- a/cipher/gost.c +++ b/cipher/gost.c @@ -1,18 +1,18 @@ /* gost.c - GOST encryption - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * * The description of GOST (and the used S-boxes) are taken from: * Bruce Schneier: Applied Cryptography. John Wiley & Sons, 1996. * ISBN 0-471-11709-9. . * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/cipher/gost.h b/cipher/gost.h index d0f4186e..4c036747 100644 --- a/cipher/gost.h +++ b/cipher/gost.h @@ -1,14 +1,14 @@ /* gost.h - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/cipher/md.c b/cipher/md.c index fbae0976..dd40136a 100644 --- a/cipher/md.c +++ b/cipher/md.c @@ -1,14 +1,14 @@ /* md.c - message digest dispatcher - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/cipher/md.h b/cipher/md.h index 5903946c..dcdfe800 100644 --- a/cipher/md.h +++ b/cipher/md.h @@ -1,14 +1,14 @@ /* md.h - digest functions - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/cipher/md5.c b/cipher/md5.c index ef95c7ef..4a04abfd 100644 --- a/cipher/md5.c +++ b/cipher/md5.c @@ -1,51 +1,25 @@ /* md5.c - MD5 Message-Digest Algorithm - * Copyright (c) 1994 by Werner Koch (dd9jn) + * Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc. * - * This is a hacked version from WkLib + * according to the definition of MD5 in RFC 1321 from April 1992. + * NOTE: This is *not* the same file as the one from glibc. * - * This file is part of WkLib. + * 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 the + * Free Software Foundation; either version 2, or (at your option) any + * later version. * - * WkLib 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 program 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. * - * WkLib 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 program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - *********************************************************************** - ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. ** - ** ** - ** License to copy and use this software is granted provided that ** - ** it is identified as the "RSA Data Security, Inc. MD5 Message- ** - ** Digest Algorithm" in all material mentioning or referencing this ** - ** software or this function. ** - ** ** - ** License is also granted to make and use derivative works ** - ** provided that such works are identified as "derived from the RSA ** - ** Data Security, Inc. MD5 Message-Digest Algorithm" in all ** - ** material mentioning or referencing the derived work. ** - ** ** - ** RSA Data Security, Inc. makes no representations concerning ** - ** either the merchantability of this software or the suitability ** - ** of this software for any particular purpose. It is provided "as ** - ** is" without express or implied warranty of any kind. ** - ** ** - ** These notices must be retained in any copies of any part of this ** - ** documentation and/or software. ** - *********************************************************************** - * - * History: - * 16.01.95 wk now uses generic base-64 support - * 24.01.95 wk changed back to original base-64 coding, because - * the generic base-64 support was changed to go conform - * with RFC1113 ! + * 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. */ +/* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. */ +/* modified for GNUPG by <werner.koch@guug.de> */ /* Test values: * "" D4 1D 8C D9 8F 00 B2 04 E9 80 09 98 EC F8 42 7E @@ -64,128 +38,245 @@ #include "memory.h" -#if __WATCOMC__ && defined(M_I86) - /* 16-Bit Compiler breaks Code in Function Transform() */ - /* (at least when compiling for windows) */ - #ifndef __SW_OD - #error must be compiled without optimizations - #endif +#ifdef BIG_ENDIAN_HOST + #define SWAP(n) \ + (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24)) +#else + #define SWAP(n) (n) #endif +/* This array contains the bytes used to pad the buffer to the next + 64-byte boundary. (RFC 1321, 3.1: Step 1) */ +static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ... */ }; -static void Transform(u32 *buf,u32 *in); - -static byte PADDING[64] = { - 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -}; - -/* F, G, H and I are basic MD5 functions */ -#define F(x, y, z) (((x) & (y)) | ((~x) & (z))) -#define G(x, y, z) (((x) & (z)) | ((y) & (~z))) -#define H(x, y, z) ((x) ^ (y) ^ (z)) -#define I(x, y, z) ((y) ^ ((x) | (~z))) - -/* ROTATE_LEFT rotates x left n bits */ -#if defined(__GNUC__) && defined(__i386__) -static inline u32 -ROTATE_LEFT(u32 x, int n) +void +md5_init( MD5_CONTEXT *ctx ) { - __asm__("roll %%cl,%0" - :"=r" (x) - :"0" (x),"c" (n)); - return x; + ctx->A = 0x67452301; + ctx->B = 0xefcdab89; + ctx->C = 0x98badcfe; + ctx->D = 0x10325476; + + ctx->total[0] = ctx->total[1] = 0; + ctx->buflen = 0; } -#else - #define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n)))) -#endif -/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4 */ -/* Rotation is separate from addition to prevent recomputation */ -#define FF(a, b, c, d, x, s, ac) \ - {(a) += F ((b), (c), (d)) + (x) + (u32)(ac); \ - (a) = ROTATE_LEFT ((a), (s)); \ - (a) += (b); \ - } -#define GG(a, b, c, d, x, s, ac) \ - {(a) += G ((b), (c), (d)) + (x) + (u32)(ac); \ - (a) = ROTATE_LEFT ((a), (s)); \ - (a) += (b); \ - } -#define HH(a, b, c, d, x, s, ac) \ - {(a) += H ((b), (c), (d)) + (x) + (u32)(ac); \ - (a) = ROTATE_LEFT ((a), (s)); \ - (a) += (b); \ - } -#define II(a, b, c, d, x, s, ac) \ - {(a) += I ((b), (c), (d)) + (x) + (u32)(ac); \ - (a) = ROTATE_LEFT ((a), (s)); \ - (a) += (b); \ - } -void -md5_init( MD5_CONTEXT *mdContext) + +/* These are the four functions used in the four steps of the MD5 algorithm + and defined in the RFC 1321. The first function is a little bit optimized + (as found in Colin Plumbs public domain implementation). */ +/* #define FF(b, c, d) ((b & c) | (~b & d)) */ +#define FF(b, c, d) (d ^ (b & (c ^ d))) +#define FG(b, c, d) FF (d, b, c) +#define FH(b, c, d) (b ^ c ^ d) +#define FI(b, c, d) (c ^ (b | ~d)) + + +/**************** + * transform n*64 bytes + */ +static void +transform( MD5_CONTEXT *ctx, const void *buffer, size_t len ) { - mdContext->i[0] = mdContext->i[1] = (u32)0; - /* Load magic initialization constants. - */ - mdContext->buf[0] = (u32)0x67452301L; - mdContext->buf[1] = (u32)0xefcdab89L; - mdContext->buf[2] = (u32)0x98badcfeL; - mdContext->buf[3] = (u32)0x10325476L; - mdContext->count = 0; + u32 correct_words[16]; + const u32 *words = buffer; + size_t nwords = len / sizeof(u32); + const u32 *endp = words + nwords; + u32 A = ctx->A; + u32 B = ctx->B; + u32 C = ctx->C; + u32 D = ctx->D; + + /* First increment the byte count. RFC 1321 specifies the possible + length of the file up to 2^64 bits. Here we only compute the + number of bytes. Do a double word increment. */ + ctx->total[0] += len; + if( ctx->total[0] < len ) + ++ctx->total[1]; + + + /* Process all bytes in the buffer with 64 bytes in each round of + the loop. */ + while(words < endp) { + u32 *cwp = correct_words; + u32 A_save = A; + u32 B_save = B; + u32 C_save = C; + u32 D_save = D; + + /* First round: using the given function, the context and a constant + the next context is computed. Because the algorithms processing + unit is a 32-bit word and it is determined to work on words in + little endian byte order we perhaps have to change the byte order + before the computation. To reduce the work for the next steps + we store the swapped words in the array CORRECT_WORDS. */ + +#define OP(a, b, c, d, s, T) \ + do \ + { \ + a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T; \ + ++words; \ + CYCLIC (a, s); \ + a += b; \ + } \ + while (0) + + /* It is unfortunate that C does not provide an operator for + cyclic rotation. Hope the C compiler is smart enough. */ +#define CYCLIC(w, s) (w = (w << s) | (w >> (32 - s))) + + /* Before we start, one word to the strange constants. + They are defined in RFC 1321 as + + T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64 + */ + + /* Round 1. */ + OP (A, B, C, D, 7, 0xd76aa478); + OP (D, A, B, C, 12, 0xe8c7b756); + OP (C, D, A, B, 17, 0x242070db); + OP (B, C, D, A, 22, 0xc1bdceee); + OP (A, B, C, D, 7, 0xf57c0faf); + OP (D, A, B, C, 12, 0x4787c62a); + OP (C, D, A, B, 17, 0xa8304613); + OP (B, C, D, A, 22, 0xfd469501); + OP (A, B, C, D, 7, 0x698098d8); + OP (D, A, B, C, 12, 0x8b44f7af); + OP (C, D, A, B, 17, 0xffff5bb1); + OP (B, C, D, A, 22, 0x895cd7be); + OP (A, B, C, D, 7, 0x6b901122); + OP (D, A, B, C, 12, 0xfd987193); + OP (C, D, A, B, 17, 0xa679438e); + OP (B, C, D, A, 22, 0x49b40821); + + /* For the second to fourth round we have the possibly swapped words + in CORRECT_WORDS. Redefine the macro to take an additional first + argument specifying the function to use. */ +#undef OP +#define OP(f, a, b, c, d, k, s, T) \ + do \ + { \ + a += f (b, c, d) + correct_words[k] + T; \ + CYCLIC (a, s); \ + a += b; \ + } \ + while (0) + + /* Round 2. */ + OP (FG, A, B, C, D, 1, 5, 0xf61e2562); + OP (FG, D, A, B, C, 6, 9, 0xc040b340); + OP (FG, C, D, A, B, 11, 14, 0x265e5a51); + OP (FG, B, C, D, A, 0, 20, 0xe9b6c7aa); + OP (FG, A, B, C, D, 5, 5, 0xd62f105d); + OP (FG, D, A, B, C, 10, 9, 0x02441453); + OP (FG, C, D, A, B, 15, 14, 0xd8a1e681); + OP (FG, B, C, D, A, 4, 20, 0xe7d3fbc8); + OP (FG, A, B, C, D, 9, 5, 0x21e1cde6); + OP (FG, D, A, B, C, 14, 9, 0xc33707d6); + OP (FG, C, D, A, B, 3, 14, 0xf4d50d87); + OP (FG, B, C, D, A, 8, 20, 0x455a14ed); + OP (FG, A, B, C, D, 13, 5, 0xa9e3e905); + OP (FG, D, A, B, C, 2, 9, 0xfcefa3f8); + OP (FG, C, D, A, B, 7, 14, 0x676f02d9); + OP (FG, B, C, D, A, 12, 20, 0x8d2a4c8a); + + /* Round 3. */ + OP (FH, A, B, C, D, 5, 4, 0xfffa3942); + OP (FH, D, A, B, C, 8, 11, 0x8771f681); + OP (FH, C, D, A, B, 11, 16, 0x6d9d6122); + OP (FH, B, C, D, A, 14, 23, 0xfde5380c); + OP (FH, A, B, C, D, 1, 4, 0xa4beea44); + OP (FH, D, A, B, C, 4, 11, 0x4bdecfa9); + OP (FH, C, D, A, B, 7, 16, 0xf6bb4b60); + OP (FH, B, C, D, A, 10, 23, 0xbebfbc70); + OP (FH, A, B, C, D, 13, 4, 0x289b7ec6); + OP (FH, D, A, B, C, 0, 11, 0xeaa127fa); + OP (FH, C, D, A, B, 3, 16, 0xd4ef3085); + OP (FH, B, C, D, A, 6, 23, 0x04881d05); + OP (FH, A, B, C, D, 9, 4, 0xd9d4d039); + OP (FH, D, A, B, C, 12, 11, 0xe6db99e5); + OP (FH, C, D, A, B, 15, 16, 0x1fa27cf8); + OP (FH, B, C, D, A, 2, 23, 0xc4ac5665); + + /* Round 4. */ + OP (FI, A, B, C, D, 0, 6, 0xf4292244); + OP (FI, D, A, B, C, 7, 10, 0x432aff97); + OP (FI, C, D, A, B, 14, 15, 0xab9423a7); + OP (FI, B, C, D, A, 5, 21, 0xfc93a039); + OP (FI, A, B, C, D, 12, 6, 0x655b59c3); + OP (FI, D, A, B, C, 3, 10, 0x8f0ccc92); + OP (FI, C, D, A, B, 10, 15, 0xffeff47d); + OP (FI, B, C, D, A, 1, 21, 0x85845dd1); + OP (FI, A, B, C, D, 8, 6, 0x6fa87e4f); + OP (FI, D, A, B, C, 15, 10, 0xfe2ce6e0); + OP (FI, C, D, A, B, 6, 15, 0xa3014314); + OP (FI, B, C, D, A, 13, 21, 0x4e0811a1); + OP (FI, A, B, C, D, 4, 6, 0xf7537e82); + OP (FI, D, A, B, C, 11, 10, 0xbd3af235); + OP (FI, C, D, A, B, 2, 15, 0x2ad7d2bb); + OP (FI, B, C, D, A, 9, 21, 0xeb86d391); + /* Add the starting values of the context. */ + A += A_save; + B += B_save; + C += C_save; + D += D_save; + } + + /* Put checksum in context given as argument. */ + ctx->A = A; + ctx->B = B; + ctx->C = C; + ctx->D = D; } -/* The routine Update updates the message-digest context to + + +/* The routine updates the message-digest context to * account for the presence of each of the characters inBuf[0..inLen-1] * in the message whose digest is being computed. */ void -md5_write( MD5_CONTEXT *mdContext, byte *inBuf, size_t inLen) +md5_write( MD5_CONTEXT *ctx, const void *buffer, size_t len) { - register int i, ii; - int mdi; - u32 in[16]; - - if(mdContext->count) { /* flush the buffer */ - i = mdContext->count; - mdContext->count = 0; - md5_write( mdContext, mdContext->digest, i); - } - if( !inBuf ) - return; - - /* compute number of bytes mod 64 */ - mdi = (int)((mdContext->i[0] >> 3) & 0x3F); - - /* update number of bits */ - if((mdContext->i[0] + ((u32)inLen << 3)) < mdContext->i[0]) - mdContext->i[1]++; - mdContext->i[0] += ((u32)inLen << 3); - mdContext->i[1] += ((u32)inLen >> 29); - - while(inLen--) { - /* add new character to buffer, increment mdi */ - mdContext->in[mdi++] = *inBuf++; - - /* transform if necessary */ - if( mdi == 0x40 ) { - for(i = 0, ii = 0; i < 16; i++, ii += 4) - in[i] = (((u32)mdContext->in[ii+3]) << 24) | - (((u32)mdContext->in[ii+2]) << 16) | - (((u32)mdContext->in[ii+1]) << 8) | - ((u32)mdContext->in[ii]); - Transform(mdContext->buf, in); - mdi = 0; - } - } + /* When we already have some bits in our internal buffer concatenate + both inputs first. */ + if (ctx->buflen != 0) + { + size_t left_over = ctx->buflen; + size_t add = 128 - left_over > len ? len : 128 - left_over; + + memcpy (&ctx->buffer[left_over], buffer, add); + ctx->buflen += add; + + if (left_over + add > 64) + { + transform(ctx, ctx->buffer, (left_over + add) & ~63); + /* The regions in the following copy operation cannot overlap. */ + memcpy (ctx->buffer, &ctx->buffer[(left_over + add) & ~63], + (left_over + add) & 63); + ctx->buflen = (left_over + add) & 63; + } + + buffer = (const char *) buffer + add; + len -= add; + } + + /* Process available complete blocks. */ + if (len > 64) + { + transform( ctx, buffer, len & ~63); + buffer = (const char *) buffer + (len & ~63); + len &= 63; + } + + /* Move remaining bytes in internal buffer. */ + if (len > 0) + { + memcpy (ctx->buffer, buffer, len); + ctx->buflen = len; + } } @@ -197,145 +288,33 @@ md5_write( MD5_CONTEXT *mdContext, byte *inBuf, size_t inLen) */ void -md5_final( MD5_CONTEXT *mdContext ) -{ - u32 in[16]; - int mdi; - unsigned int i, ii; - unsigned int padLen; - - if(mdContext->count) /* flush buffer */ - md5_write(mdContext, NULL, 0 ); - /* save number of bits */ - in[14] = mdContext->i[0]; - in[15] = mdContext->i[1]; - - /* compute number of bytes mod 64 */ - mdi = (int)((mdContext->i[0] >> 3) & 0x3F); - - /* pad out to 56 mod 64 */ - padLen = (mdi < 56) ? (56 - mdi) : (120 - mdi); - md5_write(mdContext, PADDING, padLen); - - /* append length in bits and transform */ - for(i = 0, ii = 0; i < 14; i++, ii += 4) - in[i] = (((u32)mdContext->in[ii+3]) << 24) | - (((u32)mdContext->in[ii+2]) << 16) | - (((u32)mdContext->in[ii+1]) << 8) | - ((u32)mdContext->in[ii]); - Transform(mdContext->buf, in); - - /* store buffer in digest */ - for(i = 0, ii = 0; i < 4; i++, ii += 4) { - mdContext->digest[ii] = (byte)(mdContext->buf[i] & 0xFF); - mdContext->digest[ii+1] = (byte)((mdContext->buf[i] >> 8) & 0xFF); - mdContext->digest[ii+2] = (byte)((mdContext->buf[i] >> 16) & 0xFF); - mdContext->digest[ii+3] = (byte)((mdContext->buf[i] >> 24) & 0xFF); - } -} - - -/* Basic MD5 step. Transforms buf based on in. Note that if the Mysterious - * Constants are arranged backwards in little-endian order and decrypted with - * the DES they produce OCCULT MESSAGES! - */ -static void -Transform(register u32 *buf,register u32 *in) +md5_final( MD5_CONTEXT *ctx ) { - register u32 a = buf[0], b = buf[1], c = buf[2], d = buf[3]; - - /* Round 1 */ -#define S11 7 -#define S12 12 -#define S13 17 -#define S14 22 - FF ( a, b, c, d, in[ 0], S11, 0xD76AA478L); /* 1 */ - FF ( d, a, b, c, in[ 1], S12, 0xE8C7B756L); /* 2 */ - FF ( c, d, a, b, in[ 2], S13, 0x242070DBL); /* 3 */ - FF ( b, c, d, a, in[ 3], S14, 0xC1BDCEEEL); /* 4 */ - FF ( a, b, c, d, in[ 4], S11, 0xF57C0FAFL); /* 5 */ - FF ( d, a, b, c, in[ 5], S12, 0x4787C62AL); /* 6 */ - FF ( c, d, a, b, in[ 6], S13, 0xA8304613L); /* 7 */ - FF ( b, c, d, a, in[ 7], S14, 0xFD469501L); /* 8 */ - FF ( a, b, c, d, in[ 8], S11, 0x698098D8L); /* 9 */ - FF ( d, a, b, c, in[ 9], S12, 0x8B44F7AFL); /* 10 */ - FF ( c, d, a, b, in[10], S13, 0xFFFF5BB1L); /* 11 */ - FF ( b, c, d, a, in[11], S14, 0x895CD7BEL); /* 12 */ - FF ( a, b, c, d, in[12], S11, 0x6B901122L); /* 13 */ - FF ( d, a, b, c, in[13], S12, 0xFD987193L); /* 14 */ - FF ( c, d, a, b, in[14], S13, 0xA679438EL); /* 15 */ - FF ( b, c, d, a, in[15], S14, 0x49B40821L); /* 16 */ - - /* Round 2 */ -#define S21 5 -#define S22 9 -#define S23 14 -#define S24 20 - GG ( a, b, c, d, in[ 1], S21, 0xF61E2562L); /* 17 */ - GG ( d, a, b, c, in[ 6], S22, 0xC040B340L); /* 18 */ - GG ( c, d, a, b, in[11], S23, 0x265E5A51L); /* 19 */ - GG ( b, c, d, a, in[ 0], S24, 0xE9B6C7AAL); /* 20 */ - GG ( a, b, c, d, in[ 5], S21, 0xD62F105DL); /* 21 */ - GG ( d, a, b, c, in[10], S22, 0x02441453L); /* 22 */ - GG ( c, d, a, b, in[15], S23, 0xD8A1E681L); /* 23 */ - GG ( b, c, d, a, in[ 4], S24, 0xE7D3FBC8L); /* 24 */ - GG ( a, b, c, d, in[ 9], S21, 0x21E1CDE6L); /* 25 */ - GG ( d, a, b, c, in[14], S22, 0xC33707D6L); /* 26 */ - GG ( c, d, a, b, in[ 3], S23, 0xF4D50D87L); /* 27 */ - GG ( b, c, d, a, in[ 8], S24, 0x455A14EDL); /* 28 */ - GG ( a, b, c, d, in[13], S21, 0xA9E3E905L); /* 29 */ - GG ( d, a, b, c, in[ 2], S22, 0xFCEFA3F8L); /* 30 */ - GG ( c, d, a, b, in[ 7], S23, 0x676F02D9L); /* 31 */ - GG ( b, c, d, a, in[12], S24, 0x8D2A4C8AL); /* 32 */ - - /* Round 3 */ -#define S31 4 -#define S32 11 -#define S33 16 -#define S34 23 - HH ( a, b, c, d, in[ 5], S31, 0xFFFA3942L); /* 33 */ - HH ( d, a, b, c, in[ 8], S32, 0x8771F681L); /* 34 */ - HH ( c, d, a, b, in[11], S33, 0x6D9D6122L); /* 35 */ - HH ( b, c, d, a, in[14], S34, 0xFDE5380CL); /* 36 */ - HH ( a, b, c, d, in[ 1], S31, 0xA4BEEA44L); /* 37 */ - HH ( d, a, b, c, in[ 4], S32, 0x4BDECFA9L); /* 38 */ - HH ( c, d, a, b, in[ 7], S33, 0xF6BB4B60L); /* 39 */ - HH ( b, c, d, a, in[10], S34, 0xBEBFBC70L); /* 40 */ - HH ( a, b, c, d, in[13], S31, 0x289B7EC6L); /* 41 */ - HH ( d, a, b, c, in[ 0], S32, 0xEAA127FAL); /* 42 */ - HH ( c, d, a, b, in[ 3], S33, 0xD4EF3085L); /* 43 */ - HH ( b, c, d, a, in[ 6], S34, 0x04881D05L); /* 44 */ - HH ( a, b, c, d, in[ 9], S31, 0xD9D4D039L); /* 45 */ - HH ( d, a, b, c, in[12], S32, 0xE6DB99E5L); /* 46 */ - HH ( c, d, a, b, in[15], S33, 0x1FA27CF8L); /* 47 */ - HH ( b, c, d, a, in[ 2], S34, 0xC4AC5665L); /* 48 */ - - /* Round 4 */ -#define S41 6 -#define S42 10 -#define S43 15 -#define S44 21 - II ( a, b, c, d, in[ 0], S41, 0xF4292244L); /* 49 */ - II ( d, a, b, c, in[ 7], S42, 0x432AFF97L); /* 50 */ - II ( c, d, a, b, in[14], S43, 0xAB9423A7L); /* 51 */ - II ( b, c, d, a, in[ 5], S44, 0xFC93A039L); /* 52 */ - II ( a, b, c, d, in[12], S41, 0x655B59C3L); /* 53 */ - II ( d, a, b, c, in[ 3], S42, 0x8F0CCC92L); /* 54 */ - II ( c, d, a, b, in[10], S43, 0xFFEFF47DL); /* 55 */ - II ( b, c, d, a, in[ 1], S44, 0x85845DD1L); /* 56 */ - II ( a, b, c, d, in[ 8], S41, 0x6FA87E4FL); /* 57 */ - II ( d, a, b, c, in[15], S42, 0xFE2CE6E0L); /* 58 */ - II ( c, d, a, b, in[ 6], S43, 0xA3014314L); /* 59 */ - II ( b, c, d, a, in[13], S44, 0x4E0811A1L); /* 60 */ - II ( a, b, c, d, in[ 4], S41, 0xF7537E82L); /* 61 */ - II ( d, a, b, c, in[11], S42, 0xBD3AF235L); /* 62 */ - II ( c, d, a, b, in[ 2], S43, 0x2AD7D2BBL); /* 63 */ - II ( b, c, d, a, in[ 9], S44, 0xEB86D391L); /* 64 */ - - buf[0] += a; - buf[1] += b; - buf[2] += c; - buf[3] += d; + /* Take yet unprocessed bytes into account. */ + u32 bytes = ctx->buflen; + size_t pad; + + /* Now count remaining bytes. */ + ctx->total[0] += bytes; + if( ctx->total[0] < bytes ) + ++ctx->total[1]; + + pad = bytes >= 56 ? 64 + 56 - bytes : 56 - bytes; + memcpy (&ctx->buffer[bytes], fillbuf, pad); + + /* Put the 64-bit file length in *bits* at the end of the buffer. */ + *(u32 *) &ctx->buffer[bytes + pad] = SWAP (ctx->total[0] << 3); + *(u32 *) &ctx->buffer[bytes + pad + 4] = SWAP ((ctx->total[1] << 3) | + (ctx->total[0] >> 29)); + + /* Process last bytes. */ + transform( ctx, ctx->buffer, bytes + pad + 8); + + /* Store the result in buffer */ + ((u32 *)ctx->buffer)[0] = SWAP (ctx->A); + ((u32 *)ctx->buffer)[1] = SWAP (ctx->B); + ((u32 *)ctx->buffer)[2] = SWAP (ctx->C); + ((u32 *)ctx->buffer)[3] = SWAP (ctx->D); } diff --git a/cipher/md5.h b/cipher/md5.h index c46075a3..817a526a 100644 --- a/cipher/md5.h +++ b/cipher/md5.h @@ -1,14 +1,14 @@ /* md5.h - message digest 5 - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. @@ -23,17 +23,16 @@ #include "types.h" typedef struct { - u32 i[2]; /* number of _bits_ handled mod 2^64 */ - u32 buf[4]; /* scratch buffer */ - int count; - byte in[64]; /* input buffer */ - byte digest[16+8+1]; /* actual digest after Final call */ + u32 A,B,C,D; /* chaining variables */ + u32 total[2]; + u32 buflen; + char buffer[128]; } MD5_CONTEXT; -void md5_init( MD5_CONTEXT *c ); -void md5_write( MD5_CONTEXT *hd, byte *inbuf, size_t inlen); -void md5_final( MD5_CONTEXT *hd); -#define md5_read(h) ( (h)->digest ) +void md5_init( MD5_CONTEXT *ctx ); +void md5_write( MD5_CONTEXT *ctx, const void *buffer, size_t len); +void md5_final( MD5_CONTEXT *ctx); +#define md5_read(h) ( (h)->buffer ) #endif /*G10_MD5_H*/ diff --git a/cipher/misc.c b/cipher/misc.c index 6dcd2024..4fe7450d 100644 --- a/cipher/misc.c +++ b/cipher/misc.c @@ -1,14 +1,14 @@ /* misc.c - utility functions - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/cipher/primegen.c b/cipher/primegen.c index 3a2a91f7..cf77e66a 100644 --- a/cipher/primegen.c +++ b/cipher/primegen.c @@ -1,14 +1,14 @@ /* primegen.c - prime number generator - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/cipher/random.c b/cipher/random.c index 26777aa9..635c40a4 100644 --- a/cipher/random.c +++ b/cipher/random.c @@ -1,14 +1,14 @@ /* random.c - random number generator - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. @@ -53,11 +53,10 @@ quick_random_gen( int onoff ) int last = quick_test; if( onoff != -1 ) quick_test = onoff; - #ifdef HAVE_DEV_RANDOM - return last; - #else - return 1; /* insecure RNG */ + #ifndef HAVE_DEV_RANDOM + last = 1; /* insecure RNG */ #endif + return last; } diff --git a/cipher/rmd.h b/cipher/rmd.h index 8f53634d..d6bc007d 100644 --- a/cipher/rmd.h +++ b/cipher/rmd.h @@ -1,14 +1,14 @@ /* rmd.h - RIPE-MD hash functions - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/cipher/rmd160.c b/cipher/rmd160.c index 39f1c740..7b87d421 100644 --- a/cipher/rmd160.c +++ b/cipher/rmd160.c @@ -1,14 +1,14 @@ /* rmd160.c - RIPE-MD160 - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/cipher/rmd160test.c b/cipher/rmd160test.c index 365fde02..bfbd9bc8 100644 --- a/cipher/rmd160test.c +++ b/cipher/rmd160test.c @@ -1,14 +1,14 @@ /* rmd160test.c - ripe md 160 test program - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/cipher/sha1.c b/cipher/sha1.c index a54ec6a8..1f7367dc 100644 --- a/cipher/sha1.c +++ b/cipher/sha1.c @@ -1,16 +1,16 @@ /* sha1.c - SHA1 hash function - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * * Please see below for more legal informations! * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/cipher/sha1.h b/cipher/sha1.h index 93af2cac..1a183ffb 100644 --- a/cipher/sha1.h +++ b/cipher/sha1.h @@ -1,14 +1,14 @@ /* sha1.h - SHA1 hash function - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/cipher/smallprime.c b/cipher/smallprime.c index 74a1304a..1b3a1d45 100644 --- a/cipher/smallprime.c +++ b/cipher/smallprime.c @@ -1,14 +1,14 @@ /* smallprime.c - List of small primes - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/configure.in b/configure.in index e27b0313..f2eaa5ec 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl -dnl Configure template for G10 +dnl Configure template for GNUPG dnl dnl (Process this file with autoconf to produce a configure script.) @@ -20,7 +20,7 @@ fi VERSION=`cat $srcdir/VERSION` -PACKAGE=g10 +PACKAGE=gnupg ALL_LINGUAS="de" AC_SUBST(VERSION) AC_SUBST(PACKAGE) diff --git a/mpi/ChangeLog b/mpi/ChangeLog index f05c13e1..115da6f6 100644 --- a/mpi/ChangeLog +++ b/mpi/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 23 12:21:40 1998 Werner Koch (wk@isil.d.shuttle.de) + + * mpi/m68k/mpih-shift.S (Lspecial): Changed duplicate symbol. + Mon Feb 16 13:00:27 1998 Werner Koch (wk@isil.d.shuttle.de) * config.links : Add detection of m68k cpus diff --git a/mpi/alpha/mpih-add1.S b/mpi/alpha/mpih-add1.S index 6f88499c..54cec43f 100644 --- a/mpi/alpha/mpih-add1.S +++ b/mpi/alpha/mpih-add1.S @@ -2,16 +2,16 @@ * sum in a third limb vector. * * Copyright (C) 1995 Free Software Foundation, Inc. - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/alpha/mpih-shift.S b/mpi/alpha/mpih-shift.S index dcf0a1f4..8bbd10cd 100644 --- a/mpi/alpha/mpih-shift.S +++ b/mpi/alpha/mpih-shift.S @@ -1,15 +1,15 @@ /* alpha rshift, lshift * Copyright (C) 1994, 1995 Free Software Foundation, Inc. - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/hppa/mpih-add1.S b/mpi/hppa/mpih-add1.S index 21cad314..e01c2eed 100644 --- a/mpi/hppa/mpih-add1.S +++ b/mpi/hppa/mpih-add1.S @@ -2,16 +2,16 @@ * sum in a third limb vector. * * Copyright (C) 1992, 1994 Free Software Foundation, Inc. - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/hppa/mpih-shift.S b/mpi/hppa/mpih-shift.S index 5039c738..153fbd7f 100644 --- a/mpi/hppa/mpih-shift.S +++ b/mpi/hppa/mpih-shift.S @@ -1,15 +1,15 @@ /* hppa rshift, lshift * Copyright (C) 1992, 1994 Free Software Foundation, Inc. - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/hppa/mpih-sub1.S b/mpi/hppa/mpih-sub1.S index 361cc683..8672e314 100644 --- a/mpi/hppa/mpih-sub1.S +++ b/mpi/hppa/mpih-sub1.S @@ -1,16 +1,16 @@ /* hppa sub_n -- Sub two limb vectors of the same length > 0 and store * sum in a third limb vector. * Copyright (C) 1992, 1994 Free Software Foundation, Inc. - * Copyright (c) 1998 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/hppa1.1/mpih-mul1.S b/mpi/hppa1.1/mpih-mul1.S index d68b4eb6..1f737747 100644 --- a/mpi/hppa1.1/mpih-mul1.S +++ b/mpi/hppa1.1/mpih-mul1.S @@ -1,16 +1,16 @@ /* hppa1.1 mul_1 -- Multiply a limb vector with a limb and store * the result in a second limb vector. * Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. - * Copyright (c) 1998 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/hppa1.1/mpih-mul2.S b/mpi/hppa1.1/mpih-mul2.S index 654eb074..89c02595 100644 --- a/mpi/hppa1.1/mpih-mul2.S +++ b/mpi/hppa1.1/mpih-mul2.S @@ -1,16 +1,16 @@ /* hppa1.1 addmul_1 -- Multiply a limb vector with a limb and add * the result to a second limb vector. * Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/hppa1.1/mpih-mul3.S b/mpi/hppa1.1/mpih-mul3.S index 87f9e6a6..80868a3e 100644 --- a/mpi/hppa1.1/mpih-mul3.S +++ b/mpi/hppa1.1/mpih-mul3.S @@ -1,16 +1,16 @@ /* hppa1.1 submul_1 -- Multiply a limb vector with a limb and add * the result to a second limb vector. * Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/hppa1.1/udiv-qrnnd.S b/mpi/hppa1.1/udiv-qrnnd.S index 5e88f5c2..2b0e8cf7 100644 --- a/mpi/hppa1.1/udiv-qrnnd.S +++ b/mpi/hppa1.1/udiv-qrnnd.S @@ -2,16 +2,16 @@ * This version runs fast on PA 7000 and later. * * Copyright (C) 1993, 1994 Free Software Foundation, Inc. - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/i386/mpih-add1.S b/mpi/i386/mpih-add1.S index a9648302..b7517cf0 100644 --- a/mpi/i386/mpih-add1.S +++ b/mpi/i386/mpih-add1.S @@ -2,16 +2,16 @@ * sum in a third limb vector. * * Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc. - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/i386/mpih-mul1.S b/mpi/i386/mpih-mul1.S index a8869e6c..10679643 100644 --- a/mpi/i386/mpih-mul1.S +++ b/mpi/i386/mpih-mul1.S @@ -1,16 +1,16 @@ /* i80386 mul_1 -- Multiply a limb vector with a limb and store * the result in a second limb vector. - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1992, 1994 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/i386/mpih-mul2.S b/mpi/i386/mpih-mul2.S index 391504b7..8b124bda 100644 --- a/mpi/i386/mpih-mul2.S +++ b/mpi/i386/mpih-mul2.S @@ -1,16 +1,16 @@ /* i80386 addmul_1 -- Multiply a limb vector with a limb and add * the result to a second limb vector. - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1992, 1994 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/i386/mpih-mul3.S b/mpi/i386/mpih-mul3.S index 2654b560..5f365561 100644 --- a/mpi/i386/mpih-mul3.S +++ b/mpi/i386/mpih-mul3.S @@ -1,16 +1,16 @@ /* i80386 submul_1 -- Multiply a limb vector with a limb and add * the result to a second limb vector. - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1992, 1994 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/i386/mpih-shift.S b/mpi/i386/mpih-shift.S index 09ce31a5..f10f268e 100644 --- a/mpi/i386/mpih-shift.S +++ b/mpi/i386/mpih-shift.S @@ -1,15 +1,15 @@ /* i80386 rshift, lshift - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1992, 1994 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/i386/mpih-sub1.S b/mpi/i386/mpih-sub1.S index c0345083..fe1cdeee 100644 --- a/mpi/i386/mpih-sub1.S +++ b/mpi/i386/mpih-sub1.S @@ -1,16 +1,16 @@ /* i80386 sub_n -- Sub two limb vectors of the same length > 0 and store * sum in a third limb vector. * Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc. - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/i586/mpih-add1.S b/mpi/i586/mpih-add1.S index e9883285..a52c1646 100644 --- a/mpi/i586/mpih-add1.S +++ b/mpi/i586/mpih-add1.S @@ -3,14 +3,14 @@ * * Copyright (C) 1992, 1994, 1995, 1996 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/i586/mpih-mul1.S b/mpi/i586/mpih-mul1.S index c0bedec0..b338b1a8 100644 --- a/mpi/i586/mpih-mul1.S +++ b/mpi/i586/mpih-mul1.S @@ -2,14 +2,14 @@ * the result in a second limb vector. * Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/i586/mpih-mul2.S b/mpi/i586/mpih-mul2.S index 6b564623..df22a428 100644 --- a/mpi/i586/mpih-mul2.S +++ b/mpi/i586/mpih-mul2.S @@ -1,16 +1,16 @@ /* i80586 addmul_1 -- Multiply a limb vector with a limb and add * the result to a second limb vector. - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1992, 1994 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/i586/mpih-mul3.S b/mpi/i586/mpih-mul3.S index 69b7f467..014e33cb 100644 --- a/mpi/i586/mpih-mul3.S +++ b/mpi/i586/mpih-mul3.S @@ -1,16 +1,16 @@ /* i80586 submul_1 -- Multiply a limb vector with a limb and add * the result to a second limb vector. - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1992, 1994 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/i586/mpih-shift.S b/mpi/i586/mpih-shift.S index 9f156381..07d5fbc8 100644 --- a/mpi/i586/mpih-shift.S +++ b/mpi/i586/mpih-shift.S @@ -1,15 +1,15 @@ /* i80586 rshift, lshift - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1992, 1994 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/i586/mpih-sub1.S b/mpi/i586/mpih-sub1.S index 1f5c0bfd..2ed704e8 100644 --- a/mpi/i586/mpih-sub1.S +++ b/mpi/i586/mpih-sub1.S @@ -1,16 +1,16 @@ /* i80586 sub_n -- Sub two limb vectors of the same length > 0 and store * sum in a third limb vector. * Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc. - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/m68k/mpih-shift.S b/mpi/m68k/mpih-shift.S index a9208745..09b1bcd5 100644 --- a/mpi/m68k/mpih-shift.S +++ b/mpi/m68k/mpih-shift.S @@ -186,7 +186,7 @@ PROLOG(mpihelp_rshift) cmpl R(d5),R(cnt) bne L(Rnormal) cmpl R(res_ptr),R(s_ptr) - bls L(Lspecial) /* jump if res_ptr >= s_ptr */ + bls L(Rspecial) /* jump if res_ptr >= s_ptr */ #if (defined (__mc68020__) || defined (__NeXT__) || defined(mc68020)) lea MEM_INDX1(res_ptr,s_size,l,4),R(a2) #else /* not mc68020 */ @@ -195,7 +195,7 @@ PROLOG(mpihelp_rshift) lea MEM_INDX(res_ptr,d0,l),R(a2) #endif cmpl R(s_ptr),R(a2) - bls L(Lspecial) /* jump if s_ptr >= res_ptr + s_size */ + bls L(Rspecial) /* jump if s_ptr >= res_ptr + s_size */ L(Rnormal:) moveql #32,R(d5) @@ -242,7 +242,7 @@ L(Rend:) permissable if the source and destination don't overlap, since the function is documented to work for overlapping source and destination. */ -L(Lspecial:) +L(Rspecial:) #if (defined (__mc68020__) || defined (__NeXT__) || defined(mc68020)) lea MEM_INDX1(s_ptr,s_size,l,4),R(s_ptr) lea MEM_INDX1(res_ptr,s_size,l,4),R(res_ptr) diff --git a/mpi/mpi-add.c b/mpi/mpi-add.c index dbea7ac3..9e70316e 100644 --- a/mpi/mpi-add.c +++ b/mpi/mpi-add.c @@ -1,15 +1,15 @@ /* mpi-add.c - MPI functions - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1994, 1996 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/mpi-bit.c b/mpi/mpi-bit.c index 0d8cab70..eff7be25 100644 --- a/mpi/mpi-bit.c +++ b/mpi/mpi-bit.c @@ -1,14 +1,14 @@ /* mpi-bit.c - MPI bit level fucntions - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/mpi-cmp.c b/mpi/mpi-cmp.c index 83e85ceb..7d4c8330 100644 --- a/mpi/mpi-cmp.c +++ b/mpi/mpi-cmp.c @@ -1,14 +1,14 @@ /* mpi-cmp.c - MPI functions - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/mpi-div.c b/mpi/mpi-div.c index 52737574..b00b4542 100644 --- a/mpi/mpi-div.c +++ b/mpi/mpi-div.c @@ -1,15 +1,15 @@ /* mpi-div.c - MPI functions - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1994, 1996 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/mpi-gcd.c b/mpi/mpi-gcd.c index f31e917f..eabee63d 100644 --- a/mpi/mpi-gcd.c +++ b/mpi/mpi-gcd.c @@ -1,14 +1,14 @@ /* mpi-gcd.c - MPI functions - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/mpi-inline.h b/mpi/mpi-inline.h index 03b5fbc8..fab79055 100644 --- a/mpi/mpi-inline.h +++ b/mpi/mpi-inline.h @@ -1,15 +1,15 @@ /* mpi-inline.h - Internal to the Multi Precision Integers - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1994, 1996 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/mpi-internal.h b/mpi/mpi-internal.h index 638d980b..f0b414d2 100644 --- a/mpi/mpi-internal.h +++ b/mpi/mpi-internal.h @@ -1,15 +1,15 @@ /* mpi-internal.h - Internal to the Multi Precision Integers - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1994, 1996 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/mpi-inv.c b/mpi/mpi-inv.c index dcded3e5..2cea7281 100644 --- a/mpi/mpi-inv.c +++ b/mpi/mpi-inv.c @@ -1,14 +1,14 @@ /* mpi-inv.c - MPI functions - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/mpi-mpow.c b/mpi/mpi-mpow.c index 5ac3c639..e0ed5310 100644 --- a/mpi/mpi-mpow.c +++ b/mpi/mpi-mpow.c @@ -1,14 +1,14 @@ /* mpi-mpow.c - MPI functions - * Copyright (c) 1998 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/mpi-mul.c b/mpi/mpi-mul.c index 85ee1d8c..bfca5d0d 100644 --- a/mpi/mpi-mul.c +++ b/mpi/mpi-mul.c @@ -1,15 +1,15 @@ /* mpi-mul.c - MPI functions - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1994, 1996 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/mpi-pow.c b/mpi/mpi-pow.c index 2df34b77..2a0a4ef3 100644 --- a/mpi/mpi-pow.c +++ b/mpi/mpi-pow.c @@ -1,15 +1,15 @@ /* mpi-pow.c - MPI functions - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1994, 1996 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/mpi-scan.c b/mpi/mpi-scan.c index 329b868c..d0a3ef51 100644 --- a/mpi/mpi-scan.c +++ b/mpi/mpi-scan.c @@ -1,14 +1,14 @@ /* mpi-scan.c - MPI functions - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/mpicoder.c b/mpi/mpicoder.c index 3daea767..4d3f454a 100644 --- a/mpi/mpicoder.c +++ b/mpi/mpicoder.c @@ -1,14 +1,14 @@ /* mpicoder.c - Coder for the external representation of MPIs - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/mpih-add.c b/mpi/mpih-add.c index c01928d1..566469c3 100644 --- a/mpi/mpih-add.c +++ b/mpi/mpih-add.c @@ -1,15 +1,15 @@ /* mpihelp-add.c - MPI helper functions - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1994, 1996 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/mpih-cmp.c b/mpi/mpih-cmp.c index 235a1cdd..dad993c2 100644 --- a/mpi/mpih-cmp.c +++ b/mpi/mpih-cmp.c @@ -1,15 +1,15 @@ /* mpihelp-sub.c - MPI helper functions - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1994, 1996 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/mpih-div.c b/mpi/mpih-div.c index 9729304e..cda6150f 100644 --- a/mpi/mpih-div.c +++ b/mpi/mpih-div.c @@ -1,15 +1,15 @@ /* mpihelp-div.c - MPI helper functions - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1994, 1996 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/mpih-mul.c b/mpi/mpih-mul.c index 3b6b732b..b0266469 100644 --- a/mpi/mpih-mul.c +++ b/mpi/mpih-mul.c @@ -1,15 +1,15 @@ /* mpihelp-mul.c - MPI helper functions - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1994, 1996 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/mpih-sub.c b/mpi/mpih-sub.c index 0864ef8f..52d25b32 100644 --- a/mpi/mpih-sub.c +++ b/mpi/mpih-sub.c @@ -1,15 +1,15 @@ /* mpihelp-sub.c - MPI helper functions - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1994, 1996 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/mpiutil.c b/mpi/mpiutil.c index 3eb09f0c..2227cfc1 100644 --- a/mpi/mpiutil.c +++ b/mpi/mpiutil.c @@ -1,14 +1,14 @@ /* mpiutilac - Utility functions for MPI - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. diff --git a/mpi/pa7100/mpih-shift.S b/mpi/pa7100/mpih-shift.S index daff03f3..1287f30f 100644 --- a/mpi/pa7100/mpih-shift.S +++ b/mpi/pa7100/mpih-shift.S @@ -1,16 +1,16 @@ /* hppa rshift, lshift * optimized for the PA7100, where is runs at 3.25 cycles/limb * Copyright (C) 1992, 1994 Free Software Foundation, Inc. - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. |