diff options
| author | David Shaw <[email protected]> | 2004-02-26 02:03:27 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-02-26 02:03:27 +0000 |
| commit | f2148f03c55bf5a814aeb61b7d853ba12b6132b3 (patch) | |
| tree | dc4e1c8fe2bf64930ca4ed53e7faa2908cf50bb9 /g10/helptext.c | |
| parent | * gpgkeys_ldap.c (send_key): List pgpCertID as one of the deleted (diff) | |
| download | gnupg-f2148f03c55bf5a814aeb61b7d853ba12b6132b3.tar.gz gnupg-f2148f03c55bf5a814aeb61b7d853ba12b6132b3.zip | |
* delkey.c (do_delete_key): Allow deleting a public key with a secret
present if --expert is set.
* plaintext.c (handle_plaintext): Make bytecount static so it works with
multiple literal packets inside a message.
* encode.c, helptext.c (keygen.algo, keygen.algo.elg_se), keygen.c
(ask_algo), sig-check.c (do_check_messages), skclist.c (build_sk_list):
Rename "ElGamal" to "Elgamal" as that is the proper spelling nowadays.
Suggested by Jon Callas.
Diffstat (limited to 'g10/helptext.c')
| -rw-r--r-- | g10/helptext.c | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/g10/helptext.c b/g10/helptext.c index 0150c549c..ebaa48501 100644 --- a/g10/helptext.c +++ b/g10/helptext.c @@ -1,5 +1,6 @@ /* helptext.c - English help texts - * Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, + * 2004 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -71,29 +72,17 @@ static struct helptexts { const char *key; const char *help; } helptexts[] = { { "keygen.algo", N_( "Select the algorithm to use.\n" "\n" -"DSA (aka DSS) is the digital signature algorithm which can only be used\n" -"for signatures. This is the suggested algorithm because verification of\n" -"DSA signatures are much faster than those of ElGamal.\n" +"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n" +"for signatures.\n" "\n" -"ElGamal is an algorithm which can be used for signatures and encryption.\n" -"OpenPGP distinguishs between two flavors of this algorithms: an encrypt only\n" -"and a sign+encrypt; actually it is the same, but some parameters must be\n" -"selected in a special way to create a safe key for signatures: this program\n" -"does this but other OpenPGP implementations are not required to understand\n" -"the signature+encryption flavor.\n" +"Elgamal is an encrypt-only algorithm.\n" "\n" -"The first (primary) key must always be a key which is capable of signing;\n" -"this is the reason why the encryption only ElGamal key is not available in\n" -"this menu." +"RSA may be used for signatures or encryption.\n" +"\n" +"The first (primary) key must always be a key which is capable of signing." )}, -{ "keygen.algo.elg_se", N_( -"Although these keys are defined in RFC2440 they are not suggested\n" -"because they are not supported by all programs and signatures created\n" -"with them are quite large and very slow to verify." -)}, - { "keygen.algo.rsa_se", N_( "In general it is not a good idea to use the same key for signing and\n" "encryption. This algorithm should only be used in certain domains.\n" |