mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* 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.
This commit is contained in:
parent
0d7cae4663
commit
f2148f03c5
8 changed files with 35 additions and 33 deletions
|
@ -1041,7 +1041,7 @@ check_valid_days( const char *s )
|
|||
|
||||
|
||||
/****************
|
||||
* Returns: 0 to create both a DSA and a ElGamal key.
|
||||
* Returns: 0 to create both a DSA and a Elgamal key.
|
||||
* and only if key flags are to be written the desired usage.
|
||||
*/
|
||||
static int
|
||||
|
@ -1053,10 +1053,10 @@ ask_algo (int addmode, unsigned int *r_usage)
|
|||
*r_usage = 0;
|
||||
tty_printf(_("Please select what kind of key you want:\n"));
|
||||
if( !addmode )
|
||||
tty_printf(_(" (%d) DSA and ElGamal (default)\n"), 1 );
|
||||
tty_printf(_(" (%d) DSA and Elgamal (default)\n"), 1 );
|
||||
tty_printf( _(" (%d) DSA (sign only)\n"), 2 );
|
||||
if( addmode )
|
||||
tty_printf( _(" (%d) ElGamal (encrypt only)\n"), 3 );
|
||||
tty_printf( _(" (%d) Elgamal (encrypt only)\n"), 3 );
|
||||
tty_printf( _(" (%d) RSA (sign only)\n"), 4 );
|
||||
if (addmode)
|
||||
tty_printf( _(" (%d) RSA (encrypt only)\n"), 5 );
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue