security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-05 12:31:50 +01:00
Code Activity

g10: Spell out --full-gen-key.

Browse Source 
* g10/gpg.c (opts): Spell out option.
(main): Likewise.
* g10/keygen.c (generate_keypair): Likewise.
* doc/gpg.texi: Update accordingly.

GnuPG-bug-id: 2700
Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2016-12-09 15:10:39 +01:00
parent 892c827e72
commit 09163a6390
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/gpg.texi
View File

@ -688,7 +688,7 @@ the standard command to create a new key. In addition to the key a
revocation certificate is created and stored in the revocation certificate is created and stored in the
@file{openpgp-revocs.d} directory below the GnuPG home directory. @file{openpgp-revocs.d} directory below the GnuPG home directory.
@item --full-gen-key @item --full-generate-key
@opindex gen-key @opindex gen-key
Generate a new key pair with dialogs for all options. This is an Generate a new key pair with dialogs for all options. This is an
extended version of @option{--generate-key}. extended version of @option{--generate-key}.

7
g10/gpg.c
View File

@ -456,8 +456,9 @@ static ARGPARSE_OPTS opts[] = {
N_("quickly revoke a user-id")), N_("quickly revoke a user-id")),
ARGPARSE_c (aQuickSetExpire, "quick-set-expire", ARGPARSE_c (aQuickSetExpire, "quick-set-expire",
N_("quickly set a new expiration date")), N_("quickly set a new expiration date")),
ARGPARSE_c (aFullKeygen, "full-gen-key" , ARGPARSE_c (aFullKeygen, "full-generate-key" ,
N_("full featured key pair generation")), N_("full featured key pair generation")),
ARGPARSE_c (aFullKeygen, "full-gen-key", "@"),
ARGPARSE_c (aGenRevoke, "gen-revoke",N_("generate a revocation certificate")), ARGPARSE_c (aGenRevoke, "gen-revoke",N_("generate a revocation certificate")),
ARGPARSE_c (aDeleteKeys,"delete-keys", ARGPARSE_c (aDeleteKeys,"delete-keys",
N_("remove keys from the public keyring")), N_("remove keys from the public keyring")),
@ -4342,13 +4343,13 @@ main (int argc, char **argv)
if (opt.batch) if (opt.batch)
{ {
if (argc > 1) if (argc > 1)
wrong_args ("--full-gen-key [parameterfile]"); wrong_args ("--full-generate-key [parameterfile]");
generate_keypair (ctrl, 1, argc? *argv : NULL, NULL, 0); generate_keypair (ctrl, 1, argc? *argv : NULL, NULL, 0);
} }
else else
{ {
if (argc) if (argc)
wrong_args("--full-gen-key"); wrong_args("--full-generate-key");
generate_keypair (ctrl, 1, NULL, NULL, 0); generate_keypair (ctrl, 1, NULL, NULL, 0);
} }
break; break;

2
g10/keygen.c
View File

@ -4319,7 +4319,7 @@ generate_keypair (ctrl_t ctrl, int full, const char *fname,
#else #else
GPG_NAME GPG_NAME
#endif #endif
, "--full-gen-key" ); , "--full-generate-key" );
err = parse_key_parameter_string (NULL, -1, err = parse_key_parameter_string (NULL, -1,
&algo, &size, &keyuse, &curve, &algo, &size, &keyuse, &curve,