diff --git a/BUGS b/BUGS index e2c833cb5..f81db6e64 100644 --- a/BUGS +++ b/BUGS @@ -50,7 +50,11 @@ and after about half a day in the rsync snapshots. "trustdb transaction too large" with about 500 signatures on a key FAEBD5FC. - -Next #20 +[ **] #20 1999-06-16 0.9.7 + Using "addkey" in the edit menu with more than 1 subkey leads to + "out of secure memory" in some cases. + + +Next #21 diff --git a/ChangeLog b/ChangeLog index 701bb2b85..9645e592f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jun 16 20:16:21 CEST 1999 Werner Koch + + + * configure.in: Add test for docbook-to-man + Tue Jun 15 12:21:08 CEST 1999 Werner Koch diff --git a/README b/README index ac26fd716..34d59c975 100644 --- a/README +++ b/README @@ -1,12 +1,12 @@ -----BEGIN PGP SIGNED MESSAGE----- - GnuPG - The GNU Privacy Guard - ------------------------------- - Version 0.9.7 + GnuPG - The GNU Privacy Guard + ------------------------------- + Version 0.9.7 GnuPG is now in Beta test and you should report all bugs to the mailing list (see below). The 0.9.x versions are released mainly - to fix all remaining serious bugs. As soon as version 1.0 is out, + to fix all remaining serious bugs. As soon as version 1.0 is out, development will continue with a 1.1 series and bug fixes for the 1.0 version as needed. @@ -23,7 +23,7 @@ "Key fingerprint = 6BD9 050F D8FC 941B 4341 2DCC 68B7 AB89 5754 8DCD" You may want to add this DSA key to your GnuPG pubring and use it in - the future to verify new releases. Because you verified this README + the future to verify new releases. Because you verified this README file and _checked_that_it_is_really_my PGP2 key 0C9857A5, you can be quite sure that the above fingerprint is correct. @@ -60,7 +60,7 @@ Here is a quick summary: - 1) "./configure" + 1) "./configure" 2) "make" @@ -92,7 +92,7 @@ The normal way to create a key is - gpg --gen-key + gpg --gen-key This asks some questions and then starts key generation. To create good random numbers for the key parameters, GnuPG needs to gather @@ -119,7 +119,7 @@ Next, you should create a revocation certificate in case someone gets knowledge of your secret key or you forgot your passphrase - gpg --gen-revoke your_user_id + gpg --gen-revoke your_user_id Run this command and store the revocation certificate away. The output is always ASCII armored, so that you can print it and (hopefully @@ -127,20 +127,20 @@ Now you can use your key to create digital signatures - gpg -s file + gpg -s file This creates a file "file.gpg" which is compressed and has a signature attached. - gpg -sa file + gpg -sa file Same as above, but creates a file "file.asc" which is ASCII armored - and and ready for sending by mail. It is better to use your + and and ready for sending by mail. It is better to use your mailers features to create signatures (The mailer uses GnuPG to do this) because the mailer has the ability to MIME encode such signatures - but this is not a security issue. - gpg -s -o out file + gpg -s -o out file Creates a signature of "file", but writes the output to the file "out". @@ -149,7 +149,7 @@ your key by putting it on a key server, a web page or in your .plan file) is now able to check whether you really signed this text - gpg --verify file + gpg --verify file GnuPG now checks whether the signature is valid and prints an appropriate message. If the signature is good, you know at least @@ -160,29 +160,29 @@ create a new file that is identical to the original. gpg can also run as a filter, so that you can pipe data to verify trough it - cat signed-file | gpg | wc -l + cat signed-file | gpg | wc -l which will check the signature of signed-file and then display the number of lines in the original file. To send a message encrypted to someone you can use - gpg -e -r heine file + gpg -e -r heine file This encrypts "file" with the public key of the user "heine" and writes it to "file.gpg" - echo "hello" | gpg -ea -r heine | mail heine + echo "hello" | gpg -ea -r heine | mail heine Ditto, but encrypts "hello\n" and mails it as ASCII armored message to the user with the mail address heine. - gpg -se -r heine file + gpg -se -r heine file This encrypts "file" with the public key of "heine" and writes it to "file.gpg" after signing it with your user id. - gpg -se -r heine -u Suttner file + gpg -se -r heine -u Suttner file Ditto, but sign the file with your alternative user id "Suttner" @@ -190,7 +190,7 @@ GnuPG has some options to help you publish public keys. This is called "exporting" a key, thus - gpg --export >all-my-keys + gpg --export >all-my-keys exports all the keys in the keyring and writes them (in a binary format) to "all-my-keys". You may then mail "all-my-keys" as an @@ -201,14 +201,14 @@ To mail a public key or put it on a web page you have to create the key in ASCII armored format - gpg --export --armor | mail panther@tiger.int + gpg --export --armor | mail panther@tiger.int This will send all your public keys to your friend panther. If you have received a key from someone else you can put it into your public keyring. This is called "importing" - gpg --import [filenames] + gpg --import [filenames] New keys are appended to your keyring and already existing keys are updated. Note that GnuPG does not import keys that @@ -222,7 +222,7 @@ every other program used for management of cryptographic keys) provides other solutions. - gpg --fingerprint + gpg --fingerprint prints the so called "fingerprint" of the given username which is a sequence of hex bytes (which you may have noticed in mail @@ -237,43 +237,43 @@ Suppose however that friend of yours knows someone who knows someone who has met the owner of the public key at some computer conference. Suppose that all the people between you and the public key holder - may now act as introducers to you. Introducers signing keys thereby + may now act as introducers to you. Introducers signing keys thereby certify that they know the owner of the keys they sign. If you then trust all the introducers to have correctly signed other keys, you can be be sure that the other key really belongs to the one who claims to own it.. There are 2 steps to validate a key: - 1. First check that there is a complete chain - of signed keys from the public key you want to use - and your key and verify each signature. - 2. Make sure that you have full trust in the certificates - of all the introduces between the public key holder and - you. + 1. First check that there is a complete chain + of signed keys from the public key you want to use + and your key and verify each signature. + 2. Make sure that you have full trust in the certificates + of all the introduces between the public key holder and + you. Step 2 is the more complicated part because there is no easy way for a computer to decide who is trustworthy and who is not. GnuPG leaves this decision to you and will ask you for a trust value (here also referenced as the owner-trust of a key) for every key - needed to check the chain of certificates. You may choose from: + needed to check the chain of certificates. You may choose from: a) "I don't know" - then it is not possible to use any - of the chains of certificates, in which this key is used - as an introducer, to validate the target key. Use this if - you don't know the introducer. + of the chains of certificates, in which this key is used + as an introducer, to validate the target key. Use this if + you don't know the introducer. b) "I do not trust" - Use this if you know that the introducer - does not do a good job in certifying other keys. The effect - is the same as with a) but for a) you may later want to - change the value because you got new information about this - introducer. + does not do a good job in certifying other keys. The effect + is the same as with a) but for a) you may later want to + change the value because you got new information about this + introducer. c) "I trust marginally" - Use this if you assume that the - introducer knows what he is doing. Together with some - other marginally trusted keys, GnuPG validates the target - key then as good. + introducer knows what he is doing. Together with some + other marginally trusted keys, GnuPG validates the target + key then as good. d) "I fully trust" - Use this if you really know that this - introducer does a good job when certifying other keys. - If all the introducer are of this trust value, GnuPG - normally needs only one chain of signatures to validate - a target key okay. (But this may be adjusted with the help - of some options). + introducer does a good job when certifying other keys. + If all the introducer are of this trust value, GnuPG + normally needs only one chain of signatures to validate + a target key okay. (But this may be adjusted with the help + of some options). This information is confidential because it gives your personal opinion on the trustworthiness of someone else. Therefore this data is not stored in the keyring but in the "trustdb" @@ -286,7 +286,7 @@ Okay, here is how GnuPG helps you with key management. Most stuff is done with the --edit-key command - gpg --edit-key + gpg --edit-key GnuPG displays some information about the key and then prompts for a command (enter "help" to see a list of commands and see @@ -326,37 +326,37 @@ * Only by the short keyid (prepend a zero if it begins with A..F): - "234567C4" - "0F34E556E" - "01347A56A" - "0xAB123456 + "234567C4" + "0F34E556E" + "01347A56A" + "0xAB123456 * By a complete keyid: - "234AABBCC34567C4" - "0F323456784E56EAB" - "01AB3FED1347A5612" - "0x234AABBCC34567C4" + "234AABBCC34567C4" + "0F323456784E56EAB" + "01AB3FED1347A5612" + "0x234AABBCC34567C4" * By a fingerprint: - "1234343434343434C434343434343434" - "123434343434343C3434343434343734349A3434" - "0E12343434343434343434EAB3484343434343434" + "1234343434343434C434343434343434" + "123434343434343C3434343434343734349A3434" + "0E12343434343434343434EAB3484343434343434" The first one is MD5 the others are ripemd160 or sha1. * By an exact string: - "=Heinrich Heine " + "=Heinrich Heine " * By an email address: - "" + "" * By word match - "+Heinrich Heine duesseldorf" + "+Heinrich Heine duesseldorf" All words must match excatly (not case sensitive) and appear in any order in the user ID. Words are any sequences of letters, @@ -364,15 +364,15 @@ * By the Local ID (from the trust DB): - "#34" + "#34" This may be used by a MUA to specify an exact key after selecting a key from GnuPG (by using a special option or an extra utility) * Or by the usual substring: - "Heine" - "*Heine" + "Heine" + "*Heine" The '*' indicates substring search explicitly. @@ -400,22 +400,22 @@ Esoteric commands ----------------- - gpg --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 GnuPG is able to look at the inner structure of a encrypted packet. This command should list all kinds of rfc2440 messages. - gpgm --list-trustdb + gpgm --list-trustdb List the contents of the trust DB in a human readable format - gpgm --list-trustdb + gpgm --list-trustdb List the tree of certificates for the given usernames - gpgm --list-trust-path username + gpgm --list-trust-path username List the possible trust paths for the given username. The length of such a trust path is limited by the option --max-cert-depth @@ -437,7 +437,7 @@ the normal www.gnu.org webserver. Please direct bug reports to or, better, - post them to the mailing list (this is a + post them to the mailing list (this is a closed list - subscribe before posting, see above (~line 33)). Please direct questions about GnuPG to the mailing list or one of the pgp newsgroups and give me more time to improve diff --git a/configure.in b/configure.in index 63b5539dd..76ad05c1f 100644 --- a/configure.in +++ b/configure.in @@ -130,6 +130,9 @@ AC_PROG_CPP AC_ISC_POSIX AC_PROG_INSTALL AC_PROG_RANLIB +AC_CHECK_PROG(DOCBOOK_TO_MAN, docbook-to-man, yes, no) +AM_CONDITIONAL(HAVE_DOCBOOK_TO_MAN, test "$ac_cv_prog_DOCBOOK_TO_MAN" = yes) + if test x$compile_libgcrypt = xyes; then diff --git a/doc/Makefile.am b/doc/Makefile.am index 460a63dbb..26f83e32b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,25 +1,23 @@ ## Process this file with automake to create Makefile.in -EXTRA_DIST = DETAILS gpg.1pod gpg.1 FAQ HACKING OpenPGP +EXTRA_DIST = DETAILS gpg.sgml gpg.1 FAQ HACKING OpenPGP man_MANS = gpg.1 - -%: %pod - pod2man $< --section=`echo $@ | sed 's/^.*(?)$$/$$&/'`\ - --release="`date -r $< '+%d %b %Y'`"\ - --center="GNU Tools" --date=' '\ - >$@,$$$$ && mv -f $@,$$$$ $@\ - || rm -f $@,$$$$ - +%.1 : %.sgml +if HAVE_DOCBOOK_TO_MAN + docbook-to-man $< >$@ +else + : Warning: missing docbook-to-man, cannot make $@ +endif %.txt : %.sgml sgml2txt -c latin $* %.html : %.sgml - sgml2html -l deutsch -c latin $* + sgml2html -c latin $* %.dvi : %.sgml -rm $*.sgml.tmp diff --git a/doc/gpg.1pod b/doc/gpg.1pod deleted file mode 100644 index dc9a2e73e..000000000 --- a/doc/gpg.1pod +++ /dev/null @@ -1,631 +0,0 @@ -=head1 NAME - -gpg - GNU Privacy Guard - -=head1 SYNOPSIS - -B [--homedir name] [--options file] [options] command [args] - -=head1 DESCRIPTION - -B is the main program for the GnuPG system. - -=head1 COMMANDS - -B recognizes these commands: - -B<-s>, B<--sign> - Make a signature. This option may be combined - with B<--encrypt>. - -B<--clearsign> - Make a clear text signature. - -B<-b>, B<--detach-sign> - Make a detached signature. - -B<-e>, B<--encrypt> - Encrypt data. This option may be combined with B<--sign>. - -B<-c>, B<--symmetric> - Encrypt with symmetric cipher only - This command asks for a passphrase. - -B<--store> - Store only (make a simple RFC1991 packet). - -B<--decrypt> [I] - Decrypt file (or stdin if no file is specified) and - write it to stdout (or the file specified with - B<--output>). If the decrypted file is signed, the - signature is also verified. This command differs - from the default operation, as it never writes to the - filename which is included in the file and it - rejects files which don't begin with an encrypted - message. - -B<--verify> [[I] {I}] - Assume that I is a signature and verify it - without generating any output. With no arguments, - the signature packet is read from stdin (it may be a - detached signature when not used in batch mode). If - only a sigfile is given, it may be a complete - signature or a detached signature, in which case - the signed stuff is expected in a file without the - I<.sig> or I<.asc> extension (if such a file does - not exist it is expected at stdin - use B<-> as - filename to force a read from stdin). With more than - 1 argument, the first should be a detached signature - and the remaining files are the signed stuff. - -B<-k> [I] [I] - Kludge to be somewhat compatible with PGP. - Without arguments, all public keyrings are listed. - With one argument, only I is listed. - Special combinations are also allowed, but they may - give strange results when combined with more options. - B<-kv> Same as B<-k> - B<-kvv> List the signatures with every key. - B<-kvvv> Additionally check all signatures. - B<-kvc> List fingerprints - B<-kvvc> List fingerprints and signatures - - B - -B<--list-keys> [I] -B<--list-public-keys> [I] - List all keys from the public keyrings, or just the - ones given on the command line. - -B<--list-secret-keys> [I] - List all keys from the secret keyrings, or just the - ones given on the command line. - -B<--list-sigs> [I] - Same as B<--list-keys>, but the signatures are listed - too. - -B<--check-sigs> [I] - Same as B<--list-sigs>, but the signatures are verified. - -B<--fingerprint> [I] - List all keys with their fingerprints. This is the - same output as B but with the additional output - of a line with the fingerprint. May also be combined - with B<--list-sigs> or B<--check-sigs>. - If this command is given twice, the fingerprints of all - secondary keys are listed too. - -B<--list-packets> - List only the sequence of packets. This is mainly - useful for debugging. - -B<--gen-key> - Generate a new key pair. This command can only be - used interactive. - - -B<--edit-key> I - Present a menu which enables you to do all key - related tasks: - B - Make a signature on key of user I. - If the key is not yet signed by the default - user (or the users given with B<-u>), the - program displays the information of the key - again, together with its fingerprint and - asks whether it should be signed. This - question is repeated for all users specified - with B<-u>. - B - Same as B but the signature is marked as - non-exportbale and will therefore never be used - by others. This may be used to make keys valid - only in the local environment. - B - Revoke a signature. GnuPG asks for every - every signature which has been done by one of - teh secret keys, whether a revocation - certificate should be generated. - B - Change the owner trust value. This updates the - trust-db immediately and no save is required. - B - Create an alternate user id. - B - Delete an user id. - B - Add a subkey to this key. - B - Remove a subkey. - B - Revoke a subkey. - B - Change the key expiration time. If a key is - selected, the time of this key will be changed. - With no selection the key expiration of the - primary key is changed. - B - Change the passphrase of the secret key. - B I - Toggle selection of user id with index I. - Use 0 to deselect all. - B I - Toggle selection of subkey with index I. - Use 0 to deselect all. - B - Check all selected user ids. - B - List preferences. - B - Toggle between public and secret key listing. - B - Save all changes to the key rings and quit. - B - Quit the program without updating the - key rings. - The listing shows you the key with its secondary - keys and all user ids. Selected keys or user ids - are indicated by an asterisk. The trust value is - displayed with the primary key: the first is the - assigned owner trust and the second is the calculated - trust value. Letters are used for the values: - B<-> No ownertrust assigned / not yet calculated. - B Trust calculation has failed. - B Not enough information for calculation. - B Never trust this key. - B Marginally trusted. - B Fully trusted. - B Ultimately trusted - - -B<--delete-key> - Remove key from the public keyring - -B<--delete-secret-key> - Remove key from the secret and public keyring - -B<--gen-revoke> - Generate a revocation certificate. - -B<--export> [I] - Either export all keys from all keyrings (default - keyrings and those registered via option B<--keyring>), - or if at least one name is given, those of the given - name. The new keyring is written to F or to - the file given with option "output". Use together - with B<-a> to mail those keys. - -B<--send-keys> [I] - Same as B<--export> but sends the keys to a keyserver. - Option B<--keyserver> must be used to give the name - of this keyserver. Don't send your complete keyring - to a keyserver - select only those keys which are new - or changed by you. - -B<--export-all> [I] - Same as B<--export> but does also export keys which - are not compatible to OpenPGP. - -B<--export-secret-keys> [I] - Same as B<--export>, but does export the secret keys. - This is normally not very useful. - -B<--import>, B<--fast-import> - Import/merge keys. The fast version does not build - the trustdb; this can be done at any time with the - command B<--update-trustdb>. - -B<--recv-keys> I - Import the keys with the given key IDs from a HKP - keyserver. Option B<--keyserver> must be used to - give the name of this keyserver. - -B<--export-ownertrust> - List the assigned ownertrust values in ASCII format - for backup purposes - -B<--import-ownertrust> [I] - Update the trustdb with the ownertrust values stored - in I (or stdin if not given); existing - values will be overwritten. - -=head1 OPTIONS - -Long options can be put in an options file (default F<~/.gnupg/options>). -Do not write the 2 dashes, but simply the name of the option and any -required arguments. Lines with a hash as the first non-white-space -character are ignored. Commands may be put in this file too, but that -does not make sense. - -B recognizes these options: - - -B<-a>, B<--armor> - Create ASCII armored output. - -B<-o> I, B<--output> I - Write output to I. - -B<-u> I, B<--local-user> I - Use I as the user-id to sign. - This option is silently ignored for the list commands, - so that it can be used in an options file. - -B<--default-key> I - Use I as default user-id for signatures. If this - is not used the default user-id is the first user-id - from the secret keyring. - -B<-r> I, B<--recipient> I - Encrypt for user id I. If this option is not - specified, GnuPG asks for the user id. - -B<--encrypt-to> I - Same as B<--recipient> but this one is intended for - in the options file and may be used together with - an own user-id as an "encrypt-to-self". These keys - are only used when there are other recipients given - either by use of --recipient or by the asked user id. - No trust checking is performed for these user ids. - -B<--no-encrypt-to> - Disable the use of all B<--encrypt-to> keys. - -B<-v>, B<--verbose> - Give more information during processing. If used - twice, the input data is listed in detail. - -B<-q>, B<--quiet> - Be somewhat more quiet in some cases. - -B<-z> I - Set compress level to I. A value of 0 for I - disables compression. Default is to use the default - compression level of zlib (normally 6). - -B<-t>, B<--textmode> - Use canonical text mode. If B<-t> (but not - B<--textmode>) is used together with armoring - and signing, this enables clearsigned messages. - This kludge is needed for PGP compatibility; - normally you would use B<--sign> or B<--clearsign> - to selected the type of the signature. - -B<-n>, B<--dry-run> - Don't make any changes (not yet implemented). - -B<-i>, B<--interactive> - Prompt before overwriting any files. - -B<--batch> - Use batch mode. Never ask, do not allow interactive - commands. - -B<--no-batch> - Disable batch mode. This may be used if B - is used in the options file. - -B<--yes> - Assume "yes" on most questions. - -B<--no> - Assume "no" on most questions. - -B<--keyserver> I - Use I to lookup keys which are not yet in - your keyring. This is only done while verifying - messages with signatures. The option is also - required for the command B<--send-keys> to - specify the keyserver to where the keys should - be send. All keyservers synchronize with each - other - so there is no need to send keys to more - than one server. Using the command - "host -l pgp.net | grep wwwkeys" gives you a - list of keyservers. Because there is load - balancing using round-robin-dns you may notice - that you get different key servers. - -B<--keyring> I - Add I to the list of keyrings. - If I begins with a tilde and a slash, these - are replaced by the HOME directory. If the filename - does not contain a slash, it is assumed to be in the - home-directory (F<~/.gnupg> if B<--homedir>) is not used. - The filename may be prefixed with a scheme: - "gnupg-ring:" is the default one. - "gnupg-gdbm:" may be used for a GDBM ring. - It might make sense to use it together with - B<--no-default-keyring>. - -B<--secret-keyring> I - Same as B<--keyring> but for the secret keyrings. - -B<--homedir> I - Set the name of the home directory to I. If this - option is not used it defaults to F<~/.gnupg>. It does - not make sense to use this in a options file. This - also overrides the environment variable C. - -B<--charset> I - Set the name of the native character set. This is used - to convert some strings to proper UTF-8 encoding. - Valid values for I are: - B This is the default Latin 1 set. - B The Latin 2 set. - B The usual Russian set (rfc1489). - -B<--options> I - Read options from I and do not try to read - them from the default options file in the homedir - (see B<--homedir>). This option is ignored when used - in an options file. - -B<--no-options> - Shortcut for B<--options> I. This option is - detected before an attempt to open an option file. - -B<--load-extension> I - Load an extension module. If I does not - contain a slash it is searched in B - See the manual for more information about extensions. - -B<--debug> I - Set debugging flags. All flags are or-ed and I may - be given in C syntax (e.g. 0x0042). - -B<--debug-all> - Set all useful debugging flags. - -B<--status-fd> I - Write special status strings to the file descriptor I. - -B<--logger-fd> I - Write log output to file descriptor I and not to stderr. - -B<--no-comment> - Do not write comment packets. This option affects only - the generation of secret keys. Output of option packets - is disabled since version 0.4.2. - -B<--comment> I - Use I as comment string in clear text signatures. - -B<--default-comment> - Force to write the standard comment string in clear - text signatures. Use this to overwrite B<--comment> - from a config file. - -B<--no-version> - Omit the version string in clear text signatures. - -B<--emit-version> - Force to write the version string in clear text - signatures. Use this to overwrite a previous - B<--no-version> from a config file. - -B<--notation-data>, B<-N> I= - Put the name value pair into the signature as notation data. - I Must consists only of alphanumeric characters, digits - or the underscore; the first character muts not be a digit. - B May be any printable string; it will encoded in UTF8, - so sou should have check that your B<--charset> is set right. - If you prefix I with an exclamation mark, the notation - data will be flagged as critical. (rfc2440:5.2.3.15). - -B<--set-policy-url> I - Use I as Policy URL for signatures (rfc2440:5.2.3.19). - If you prefix it with an exclamation mark, the policy URL - packet will be flagged as critical. - -B<--set-filename> I - Use I as the name of file which is stored in - messages. - -B<--completes-needed> I - Number of completely trusted users to introduce a new - key signer (defaults to 1). - -B<--marginals-needed> I - Number of marginally trusted users to introduce a new - key signer (defaults to 3) - -B<--max-cert-depth> I - Maximum depth of a certification chain (default is 5). - -B<--cipher-algo> I - Use I as cipher algorithm. Running the program - with the command B<--version> yields a list of supported - algorithms. If this is not used the cipher algorithm is - selected from the preferences stored with the key. - -B<--digest-algo> I - Use I as message digest algorithm. Running the - program with the command B<--version> yields a list of - supported algorithms. Please note that using this - option may violate the OpenPGP requirement, that a - 160 bit hash is to be used for DSA. - -B<--s2k-cipher-algo> I - Use I as the cipher algorithm used to protect secret - keys. The default cipher is BLOWFISH. This cipher is - also used for conventional encryption if B<--cipher-algo> - is not given. - -B<--s2k-digest-algo> I - Use I as the digest algorithm used to mangle the - passphrases. The default algorithm is RIPE-MD-160. - This digest algorithm is also used for conventional - encryption if B<--digest-algo> is not given. - -B<--s2k-mode> I - Selects how passphrases are mangled. A number of I<0> - uses the plain passphrase (which is not recommended), - a I<1> (default) adds a salt to the passphrase and - I<3> iterates the whole process a couple of times. - Unless -B<--rfc1991> is used, this mode is also used - for conventional encryption. - -B<--compress-algo> I - Use compress algorithm I. Default is I<2> which is - RFC1950 compression. You may use I<1> to use the old zlib - version which is used by PGP. The default algorithm may - give better results because the window size is not limited - to 8K. If this is not used the OpenPGP behavior is used, - i.e. the compression algorithm is selected from the - preferences. - -B<--throw-keyid> - Do not put the keyid into encrypted packets. This option - hides the receiver of the message and is a countermeasure - against traffic analysis. It may slow down the decryption - process because all available secret keys are tried. - -B<--not-dash-escaped> - This option changes the behavior of cleartext signatures - so that they can be used for patch files. You should not - send such an armored file via email because all spaces - and line endings are hashed too. You can not use this - option for data which has 5 dashes at the beginning of a - line, patch files don't have this. A special armor header - line tells GnuPG about this cleartext signature option. - -B<--escape-from-lines> - Because some mailers change lines starting with "From " - to ">From " it is good to handle such lines in a special - way when creating cleartext signatures. All other PGP - versions do it this way too. This option is not enabled - by default because it would violate rfc2440. - -B<--passphrase-fd> I - Read the passphrase from file descriptor I. If you use - 0 for I, the passphrase will be read from stdin. This - can only be used if only one passphrase is supplied. - B - -B<--rfc1991> - Try to be more RFC1991 (PGP 2.x) compliant. - -B<--openpgp> - Reset all packet, cipher and digest options to OpenPGP - behavior. Use this option to reset all previous - options like B<--rfc1991>, B<--force-v3-sigs>, B<--s2k-*>, - B<--cipher-algo>, B<--digest-algo> and B<--compress-algo> to - OpenPGP compliant values. - -B<--force-v3-sigs> - OpenPGP states that an implementation should generate - v4 signatures but PGP 5.x recognizes v4 signatures only - on key material. This options forces v3 signatures for - signatures on data. - -B<--force-mdc> - Force the use of encryption with appended manipulation - code. This is always used with the newer cipher (those - with a blocksize greater than 64 bit). - -B<--lock-once> - Lock the file the first time a lock is requested - and do not release the lock until the process - terminates. - -B<--lock-multiple> - Release the locks every time a lock is no longer - needed. Use this to overwrite a previous B<--lock-once> - from a config file. - -B<--no-verbose> - Reset verbose level to 0. - -B<--no-greeting> - Suppress the initial copyright message but do not - enter batch mode. - -B<--no-armor> - Assume the input data is not in ASCII armored format. - -B<--no-default-keyring> - Do not add the default keyrings to the list of - keyrings. - -B<--skip-verify> - Skip the signature verification step. This may be - used to make the encryption faster if the signature - verification is not needed. - -B<--version> - Print version information along with a list - of supported algorithms. - -B<--with-colons> - Print key listings delimited by colons. - -B<--with-key-data> - Print key listings delimited by colons and print the public key data. - -B<--warranty> - Print warranty information. - -B<-h>, B<--help> - Print usage information. - - -=head1 RETURN VALUE - -The Program returns 0 if everything was fine, 1 if at least -a signature was bad, and other error codes for fatal errors. - -=head1 EXAMPLES - - -se -r Bob [file] sign and encrypt for user Bob - -sat [file] make a clear text signature - -sb [file] make a detached signature - -k [userid] show keys - -kc [userid] show fingerprint - -=head1 ENVIRONMENT - -C Used to locate the default home directory. -C If set directory used instead of F<~/.gnupg>. - -=head1 FILES - -F<~/.gnupg/secring.gpg> The secret keyring -F<~/.gnupg/secring.gpg.lock> and the lock file - -F<~/.gnupg/pubring.gpg> The public keyring -F<~/.gnupg/pubring.gpg.lock> and the lock file - -F<~/.gnupg/trustdb.gpg> The trust database -F<~/.gnupg/trustdb.gpg.lock> and the lock file - -F<~/.gnupg/options> May contain options -F Skeleton file - -F Default location for extensions - -=head1 SEE ALSO - -gpg(1) - - -=head1 WARNINGS - -Use a B password for your user account and a B passphrase -to protect your secret key. This passphrase is the weakest part of the -whole system. Programs to do dictionary attacks on your secret keyring -are very easy to write and so you should protect your B<~/.gnupg/> -directory very well. - -Keep in mind that, if this program is used over a network (telnet), it -is B easy to spy out your passphrase! - -=head1 BUGS - -On many systems this program should be installed as setuid(root). This -is necessary to lock memory pages. Locking memory pages prevents the -operating system from writing memory pages to disk. If you get no -warning message about insecure memory your operating system supports -locking without being root. The program drops root privileges as soon -as locked memory is allocated. - diff --git a/doc/gpg.sgml b/doc/gpg.sgml new file mode 100644 index 000000000..645063db5 --- /dev/null +++ b/doc/gpg.sgml @@ -0,0 +1,1214 @@ + + + + +directory"> +file"> +&ParmFile;"> +files"> +&ParmFiles;"> +names"> +&ParmNames;"> +name"> +&ParmName;"> +key IDs"> +n"> +flags"> +string"> +value"> +name=value"> +]> + + + + gpg + 1 + GNU Tools + + + encryption and signing tool + + + +gpg + --homedir + --options + + command + + + + + + DESCRIPTION + + + + + +COMMANDS + + + + + + +-s, --sign + +Make a signature. This command may be combined +with --encrypt. + + + + +--clearsign + +Make a clear text signature. + + + + +-b, --detach-sign + +Make a detached signature. + + + + +-e, --encrypt + +Encrypt data. This option may be combined with --sign. + + + + +-c, --symmetric + +Encrypt with symmetric cipher only +This command asks for a passphrase. + + + +--store + +Store only (make a simple RFC1991 packet). + + + + +--decrypt &OptParmFile; + +Decrypt &ParmFile; (or stdin if no file is specified) and +write it to stdout (or the file specified with +--output). If the decrypted file is signed, the +signature is also verified. This command differs +from the default operation, as it never writes to the +filename which is included in the file and it +rejects files which don't begin with an encrypted +message. + + + + +--verify + + +Assume that + + + + +--list-keys &OptParmNames; +--list-public-keys &OptParmNames; + +List all keys from the public keyrings, or just the +ones given on the command line. + + + + +--list-secret-keys &OptParmNames; + +List all keys from the secret keyrings, or just the +ones given on the command line. + + + + +--list-sigs &OptParmNames; + +Same as --list-keys, but the signatures are listed too. + + + + +--list-sigs &OptParmNames; + +Same as --list-sigs, but the signatures are verified. + + + + +--fingerprint &OptParmNames; + +List all keys with their fingerprints. This is the +same output as --list-keys but with the additional output +of a line with the fingerprint. May also be combined +with --list-sigs or --check-sigs. +If this command is given twice, the fingerprints of all +secondary keys are listed too. + + + + +--list-packets + +List only the sequence of packets. This is mainly +useful for debugging. + + + + +--gen-key + +Generate a new key pair. This command can only be +used interactive. + + + + +--edit-key &ParmName; + +Present a menu which enables you to do all key +related tasks: + + + + sign + +Make a signature on key of user &ParmName; +If the key is not yet signed by the default +user (or the users given with -u), the +program displays the information of the key +again, together with its fingerprint and +asks whether it should be signed. This +question is repeated for all users specified +with -u. + + lsign + +Same as --sign but the signature is marked as +non-exportbale and will therefore never be used +by others. This may be used to make keys valid +only in the local environment. + + revsig + +Revoke a signature. GnuPG asks for every +every signature which has been done by one of +the secret keys, whether a revocation +certificate should be generated. + + trust + +Change the owner trust value. This updates the +trust-db immediately and no save is required. + + adduid + +Create an alternate user id. + + deluid + +Delete an user id. + + addkey + +Add a subkey to this key. + + delkey + +Remove a subkey. + + revkey + +Revoke a subkey. + + expire + +Change the key expiration time. If a key is +selected, the time of this key will be changed. +With no selection the key expiration of the +primary key is changed. + + passwd + +Change the passphrase of the secret key. + + uid &ParmN; + +Toggle selection of user id with index &ParmN;. +Use 0 to deselect all. + + key &ParmN; + +Toggle selection of subkey with index &ParmN;. +Use 0 to deselect all. + + check + +Check all selected user ids. + + pref + +List preferences. + + toggle + +Toggle between public and secret key listing. + + save + +Save all changes to the key rings and quit. + + quit + +Quit the program without updating the +key rings. + + +The listing shows you the key with its secondary +keys and all user ids. Selected keys or user ids +are indicated by an asterisk. The trust value is +displayed with the primary key: the first is the +assigned owner trust and the second is the calculated +trust value. Letters are used for the values: + + -No ownertrust assigned / not yet calculated. + eTrust calculation has failed. + qNot enough information for calculation. + nNever trust this key. + mMarginally trusted. + fFully trusted. + uUltimately trusted. + + + + + +--delete-key &ParmName; + +Remove key from the public keyring + + + +--delete-secret-key &ParmName; + +Remove key from the secret and public keyring + + + +--gen-revoke + +Generate a revocation certificate for the complete key. To revoke +a subkey or a signature, use the --edit command. + + + + +--export &OptParmNames; + +Either export all keys from all keyrings (default +keyrings and those registered via option --keyring), +or if at least one name is given, those of the given +name. The new keyring is written to stdout or to +the file given with option "output". Use together +with --armor to mail those keys. + + + + +--send-keys &OptParmNames; + +Same as --export but sends the keys to a keyserver. +Option --keyserver must be used to give the name +of this keyserver. Don't send your complete keyring +to a keyserver - select only those keys which are new +or changed by you. + + + + +--export-all &OptParmNames; + +Same as --export, but does also export keys which +are not compatible to OpenPGP. + + + + +--export-secret-keys &OptParmNames; + +Same as --export, but does export the secret keys. +This is normally not very useful and a security risk. + + + + +--import &OptParmFiles; +--fast-import &OptParmFiles; + +Import/merge keys. The fast version does not build +the trustdb; this can be done at any time with the +command --update-trustdb. + + + + +--recv-keys &ParmKeyIDs; + +Import the keys with the given key IDs from a HKP +keyserver. Option --keyserver must be used to +give the name of this keyserver. + + + + +--export-ownertrust + +List the assigned ownertrust values in ASCII format +for backup purposes + + + + +--import-ownertrust &OptParmFiles; + +Update the trustdb with the ownertrust values stored +in &ParmFiles; (or stdin if not given); existing +values will be overwritten. + + + + +--version + +Print version information along with a list +of supported algorithms. + + + + +--warranty + +Print warranty information. + + + + +-h, --help + +Print usage information. This is a really long list even it does list +not all options. + + + + + + + + +OPTIONS + +Long options can be put in an options file (default "~/.gnupg/options"). +Do not write the 2 dashes, but simply the name of the option and any +required arguments. Lines with a hash as the first non-white-space +character are ignored. Commands may be put in this file too, but that +does not make sense. + + + + + + + + +-a, --armor + +Create ASCII armored output. + + + + +-o, --output &ParmFile; + +Write output to &ParmFile;. + + + + +-u, --local-user &ParmName; + +Use &ParmName as the user ID to sign. +This option is silently ignored for the list commands, +so that it can be used in an options file. + + + + +--default-key &ParmName; + +Use &ParmName; as default user ID for signatures. If this +is not used the default user ID is the first user ID +found in the secret keyring. + + + + +-r, --recipient &ParmName; + + +Encrypt for user id &ParmName;. If this option is not +specified, GnuPG asks for the user id. + + + + +--encrypt-to &ParmName; + +Same as --recipient but this one is intended for +in the options file and may be used together with +an own user-id as an "encrypt-to-self". These keys +are only used when there are other recipients given +either by use of --recipient or by the asked user id. +No trust checking is performed for these user ids. + + + + +--no-encrypt-to + +Disable the use of all --encrypt-to keys. + + + + +-v, --verbose + +Give more information during processing. If used +twice, the input data is listed in detail. + + + + +-q, --quiet + +Try to be as quiet as possible. + + + + +-z &ParmN; + +Set compression level to &ParmN;. A value of 0 for &ParmN; +disables compression. Default is to use the default +compression level of zlib (normally 6). + + + + +-t, --textmode + +Use canonical text mode. If -t (but not +--textmode) is used together with armoring +and signing, this enables clearsigned messages. +This kludge is needed for PGP compatibility; +normally you would use --sign or --clearsign +to selected the type of the signature. + + + + +-n, --dry-run + +Don't make any changes (this is not completely implemented). + + + + +-i, --interactive + +Prompt before overwriting any files. + + + + +--batch + +Use batch mode. Never ask, do not allow interactive +commands. + + + + +--no-batch + +Disable batch mode. This may be of use if --batch +is enabled from an options file. + + + + +--yes + +Assume "yes" on most questions. + + + + +--no + + Assume "no" on most questions. + + + + +--keyserver &ParmName; + +Use &ParmName to lookup keys which are not yet in +your keyring. This is only done while verifying +messages with signatures. The option is also +required for the command --send-keys to +specify the keyserver to where the keys should +be send. All keyservers synchronize with each +other - so there is no need to send keys to more +than one server. Using the command +"host -l pgp.net | grep wwwkeys" gives you a +list of keyservers. Because there is load +balancing using round-robin DNS you may notice +that you get different key servers. + + + + +--keyring &ParmFile; + +Add &ParmFile to the list of keyrings. +If &ParmFile begins with a tilde and a slash, these +are replaced by the HOME directory. If the filename +does not contain a slash, it is assumed to be in the +home-directory ("~/.gnupg" if --homedir is not used). +The filename may be prefixed with a scheme: +"gnupg-ring:" is the default one. +"gnupg-gdbm:" may be used for a GDBM ring. +It might make sense to use it together with --no-default-keyring. + + + + +--secret-keyring &ParmFile; + +Same as --keyring but for the secret keyrings. + + + + +--homedir &ParmDir; + +Set the name of the home directory to &ParmDir; If this +option is not used it defaults to "~/.gnupg". It does +not make sense to use this in a options file. This +also overrides the environment variable "GNUPGHOME". + + + + +--charset &ParmName; + +Set the name of the native character set. This is used +to convert some strings to proper UTF-8 encoding. +Valid values for &ParmName; are: + + +iso-8859-1This is the default Latin 1 set. + + +iso-8859-2The Latin 2 set. + + +koi8-rThe usual Russian set (rfc1489). + + + + + + +--options &ParmFile; + +Read options from &ParmFile; and do not try to read +them from the default options file in the homedir +(see --homedir). This option is ignored if used +in an options file. + + + + +--no-options + +Shortcut for "--options /dev/null". This option is +detected before an attempt to open an option file. + + + + +--load-extension &ParmName; + +Load an extension module. If &ParmName; does not +contain a slash it is searched in "/usr/local/lib/gnupg" +See the manual for more information about extensions. + + + + +--debug &ParmFlags; + +Set debugging flags. All flags are or-ed and &ParmFlags; may +be given in C syntax (e.g. 0x0042). + + + + +--debug-all + + Set all useful debugging flags. + + + + +--status-fd &ParmN; + +Write special status strings to the file descriptor &ParmN;. +See the file DETAILS in the documentation for a listing of them. + + + + +--logger-fd &ParmN; + +Write log output to file descriptor &ParmN; and not to stderr. + + + + +--no-comment + +Do not write comment packets. This option affects only +the generation of secret keys. Output of option packets +is disabled since version 0.4.2. + + + + +--comment &ParmString; + +Use &ParmString; as comment string in clear text signatures. + + + + +--default-comment + +Force to write the standard comment string in clear +text signatures. Use this to overwrite a --comment +from a config file. + + + + +--no-version + +Omit the version string in clear text signatures. + + + + +--emit-version + +Force to write the version string in clear text +signatures. Use this to overwrite a previous +--no-version from a config file. + + + + +-N, --notation-data &ParmNameValue; + +Put the name value pair into the signature as notation data. +&ParmName; must consists only of alphanumeric characters, digits +or the underscore; the first character must not be a digit. +&ParmValue; may be any printable string; it will encoded in UTF8, +so sou should have check that your --charset is set right. +If you prefix &ParmName; with an exclamation mark, the notation +data will be flagged as critical (rfc2440:5.2.3.15). + + + + +--set-policy-url &ParmString; + +Use &ParmString; as Policy URL for signatures (rfc2440:5.2.3.19). +If you prefix it with an exclamation mark, the policy URL +packet will be flagged as critical. + + + + +--set-filename &ParmString; + +Use &ParmString; as the name of file which is stored in +messages. + + + + +--completes-needed &ParmN; + +Number of completely trusted users to introduce a new +key signer (defaults to 1). + + + + +--marginals-needed &ParmN; + +Number of marginally trusted users to introduce a new +key signer (defaults to 3) + + + + +--max-cert-depth &ParmN; + +Maximum depth of a certification chain (default is 5). + + + + +--cipher-algo &ParmName; + +Use &ParmName; as cipher algorithm. Running the program +with the command --version yields a list of supported +algorithms. If this is not used the cipher algorithm is +selected from the preferences stored with the key. + + + + +--digest-algo &ParmName; + +Use &ParmName; as message digest algorithm. Running the +program with the command --version yields a list of +supported algorithms. Please note that using this +option may violate the OpenPGP requirement, that a +160 bit hash is to be used for DSA. + + + + +--s2k-cipher-algo &ParmName; + +Use &ParmName; as the cipher algorithm used to protect secret +keys. The default cipher is BLOWFISH. This cipher is +also used for conventional encryption if --cipher-algo +is not given. + + + + +--s2k-digest-algo &ParmName; + +Use &ParmName; as the digest algorithm used to mangle the +passphrases. The default algorithm is RIPE-MD-160. +This digest algorithm is also used for conventional +encryption if --digest-algo is not given. + + + + +--s2k-mode &ParmN; + +Selects how passphrases are mangled. If &ParmN; is 0 +a plain passphrase (which is not recommended) will be used, +a 1 (default) adds a salt to the passphrase and +a 3 iterates the whole process a couple of times. +Unless --rfc1991 is used, this mode is also used +for conventional encryption. + + + + +--compress-algo &ParmN; + +Use compress algorithm &ParmN;. Default is 2 which is +RFC1950 compression. You may use 1 to use the old zlib +version which is used by PGP. The default algorithm may +give better results because the window size is not limited +to 8K. If this is not used the OpenPGP behavior is used, +i.e. the compression algorithm is selected from the +preferences; note, that this can't be done if you do +not encrypt the data. + + + + +--throw-keyid + +Do not put the keyid into encrypted packets. This option +hides the receiver of the message and is a countermeasure +against traffic analysis. It may slow down the decryption +process because all available secret keys are tried. + + + + +--not-dash-escaped + +This option changes the behavior of cleartext signatures +so that they can be used for patch files. You should not +send such an armored file via email because all spaces +and line endings are hashed too. You can not use this +option for data which has 5 dashes at the beginning of a +line, patch files don't have this. A special armor header +line tells GnuPG about this cleartext signature option. + + + + +--escape-from-lines + +Because some mailers change lines starting with "From " +to "<From " it is good to handle such lines in a special +way when creating cleartext signatures. All other PGP +versions do it this way too. This option is not enabled +by default because it would violate rfc2440. + + + + +--passphrase-fd &ParmN; + +Read the passphrase from file descriptor &ParmN;. If you use +0 for &ParmN;, the passphrase will be read from stdin. This +can only be used if only one passphrase is supplied. + +Don't use this option if you can avoid it. + + + + +--rfc1991 + +Try to be more RFC1991 (PGP 2.x) compliant. + + + + +--openpgp + +Reset all packet, cipher and digest options to OpenPGP +behavior. Use this option to reset all previous +options like --rfc1991, --force-v3-sigs, --s2k-*, +--cipher-algo, --digest-algo and --compress-algo to +OpenPGP compliant values. + + + + +--force-v3-sigs + +OpenPGP states that an implementation should generate +v4 signatures but PGP 5.x recognizes v4 signatures only +on key material. This options forces v3 signatures for +signatures on data. + + + + +--force-mdc + +Force the use of encryption with appended manipulation +code. This is always used with the newer cipher (those +with a blocksize greater than 64 bit). + + + + +--lock-once + +Lock the databases the first time a lock is requested +and do not release the lock until the process +terminates. + + + + +--lock-multiple + +Release the locks every time a lock is no longer +needed. Use this to override a previous --lock-once +from a config file. + + + + +--no-verbose + +Reset verbose level to 0. + + + + +--no-greeting + +Suppress the initial copyright message but do not +enter batch mode. + + + + +--no-armor + +Assume the input data is not in ASCII armored format. + + + + +--no-default-keyring + +Do not add the default keyrings to the list of +keyrings. + + + + +--skip-verify + +Skip the signature verification step. This may be +used to make the encryption faster if the signature +verification is not needed. + + + + +--with-colons + +Print key listings delimited by colons. + + + + +--with-key-data + +Print key listings delimited by colons and print the public key data. + + + + + + + RETURN VALUE + +The program returns 0 if everything was fine, 1 if at least +a signature was bad, and other error codes for fatal errors. + + + + + EXAMPLES + + + +gpg -se -r +sign and encrypt for user Bob + + + +gpg --clearsign &ParmFile; +make a clear text signature + + + +gpg -sb &ParmFile; +make a detached signature + + + +gpg --list-keys +show keys + + + +gpg --fingerprint +show fingerprint + + + + + + + + ENVIRONMENT + + + +HOME +Used to locate the default home directory. + + +GNUPGHOME +If set directory used instead of "~/.gnupg". + + + + + + + FILES + + + +~/.gnupg/secring.gpg +The secret keyring + + + +~/.gnupg/secring.gpg.lock +and the lock file + + + +~/.gnupg/pubring.gpg +The public keyring + + + +~/.gnupg/pubring.gpg.lock +and the lock file + + + +~/.gnupg/trustdb.gpg +The trust database + + + +~/.gnupg/trustdb.gpg.lock +and the lock file + + + +~/.gnupg/options +May contain options + + + +/usr[/local]/share/gnupg/options.skel +Skeleton options file + + + +/usr[/local]/lib/gnupg/ +Default location for extensions + + + + + + + + + WARNINGS + +Use a *good* password for your user account and a *good* passphrase +to protect your secret key. This passphrase is the weakest part of the +whole system. Programs to do dictionary attacks on your secret keyring +are very easy to write and so you should protect your "~/.gnupg/" +directory very well. + + +Keep in mind that, if this program is used over a network (telnet), it +is *very* easy to spy out your passphrase! + + + + + + BUGS + +On many systems this program should be installed as setuid(root). This +is necessary to lock memory pages. Locking memory pages prevents the +operating system from writing memory pages to disk. If you get no +warning message about insecure memory your operating system supports +locking without being root. The program drops root privileges as soon +as locked memory is allocated. + + + + + diff --git a/g10/keyedit.c b/g10/keyedit.c index 6035f7d2b..614043888 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -111,7 +111,7 @@ get_keyblock_byname( KBNODE *keyblock, KBPOS *kbpos, const char *username ) static int print_and_check_one_sig( KBNODE keyblock, KBNODE node, int *inv_sigs, int *no_key, int *oth_err, - int *is_selfsig, int print_without_key ) + int *is_selfsig, int print_without_key ) { PKT_signature *sig = node->pkt->pkt.signature; int rc, sigrc; @@ -205,7 +205,7 @@ check_all_keysigs( KBNODE keyblock, int only_selected ) int selfsig; if( print_and_check_one_sig( keyblock, node, &inv_sigs, - &no_key, &oth_err, &selfsig, 0 ) ) { + &no_key, &oth_err, &selfsig, 0 ) ) { if( selfsig ) has_selfsig = 1; } @@ -1275,33 +1275,33 @@ menu_delsig( KBNODE pub_keyblock ) uid = (node->flag & NODFLG_SELUID)? node->pkt->pkt.user_id : NULL; } else if( uid && node->pkt->pkttype == PKT_SIGNATURE ) { - int okay, valid, selfsig, inv_sig, no_key, other_err; + int okay, valid, selfsig, inv_sig, no_key, other_err; tty_printf("uid "); tty_print_string( uid->name, uid->len ); tty_printf("\n"); - okay = inv_sig = no_key = other_err = 0; + okay = inv_sig = no_key = other_err = 0; valid = print_and_check_one_sig( pub_keyblock, node, - &inv_sig, &no_key, &other_err, - &selfsig, 1 ); + &inv_sig, &no_key, &other_err, + &selfsig, 1 ); + + if( valid ) + okay = cpr_get_answer_yes_no_quit( + "keyedit.delsig.valid", + _("Delete this good signature? (y/N/q)")); + else if( inv_sig || other_err ) + okay = cpr_get_answer_yes_no_quit( + "keyedit.delsig.invalid", + _("Delete this invalid signature? (y/N/q)")); + else if( no_key ) + okay = cpr_get_answer_yes_no_quit( + "keyedit.delsig.unknown", + _("Delete this unknown signature? (y/N/q)")); - if( valid ) - okay = cpr_get_answer_yes_no_quit( - "keyedit.delsig.valid", - _("Delete this good signature? (y/N/q)")); - else if( inv_sig || other_err ) - okay = cpr_get_answer_yes_no_quit( - "keyedit.delsig.invalid", - _("Delete this invalid signature? (y/N/q)")); - else if( no_key ) - okay = cpr_get_answer_yes_no_quit( - "keyedit.delsig.unknown", - _("Delete this unknown signature? (y/N/q)")); - if( okay == -1 ) break; - if( okay && selfsig && !cpr_get_answer_is_yes( + if( okay && selfsig && !cpr_get_answer_is_yes( "keyedit.delsig.selfsig", _("Really delete this self-signature? (y/N)") )) okay = 0; @@ -1400,9 +1400,9 @@ menu_expire( KBNODE pub_keyblock, KBNODE sec_keyblock ) return 0; } else if( n1 ) - tty_printf(_("Changing exiration time for a secondary key.\n")); + tty_printf(_("Changing expiration time for a secondary key.\n")); else { - tty_printf(_("Changing exiration time for the primary key.\n")); + tty_printf(_("Changing expiration time for the primary key.\n")); mainkey=1; } diff --git a/g10/keygen.c b/g10/keygen.c index 6637d95e4..1621d9445 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -800,7 +800,7 @@ do_create( int algo, unsigned nbits, KBNODE pub_root, KBNODE sec_root, /**************** - * Generate a new user id packet, or return NULL if cancelled + * Generate a new user id packet, or return NULL if canceled */ PKT_user_id * generate_user_id() @@ -856,7 +856,7 @@ generate_keypair() expire = ask_expire_interval(); uid = ask_user_id(0); if( !uid ) { - log_error(_("Key generation cancelled.\n")); + log_error(_("Key generation canceled.\n")); return; } dek = ask_passphrase( &s2k );