diff options
| author | Justus Winter <[email protected]> | 2016-12-09 14:10:39 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2016-12-13 16:30:55 +0000 |
| commit | 09163a6390bd9713f3a7946de739765b30ef6f64 (patch) | |
| tree | f769c7325a35642bb67579bbbd4a62ce828936e5 | |
| parent | g10,sm: Spell out --gen-key. (diff) | |
| download | gnupg-09163a6390bd9713f3a7946de739765b30ef6f64.tar.gz gnupg-09163a6390bd9713f3a7946de739765b30ef6f64.zip | |
g10: Spell out --full-gen-key.
* 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 <[email protected]>
| -rw-r--r-- | doc/gpg.texi | 2 | ||||
| -rw-r--r-- | g10/gpg.c | 7 | ||||
| -rw-r--r-- | g10/keygen.c | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/doc/gpg.texi b/doc/gpg.texi index 3f7375472..ff99864e2 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -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 @file{openpgp-revocs.d} directory below the GnuPG home directory. -@item --full-gen-key +@item --full-generate-key @opindex gen-key Generate a new key pair with dialogs for all options. This is an extended version of @option{--generate-key}. @@ -456,8 +456,9 @@ static ARGPARSE_OPTS opts[] = { N_("quickly revoke a user-id")), ARGPARSE_c (aQuickSetExpire, "quick-set-expire", 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")), + ARGPARSE_c (aFullKeygen, "full-gen-key", "@"), ARGPARSE_c (aGenRevoke, "gen-revoke",N_("generate a revocation certificate")), ARGPARSE_c (aDeleteKeys,"delete-keys", N_("remove keys from the public keyring")), @@ -4342,13 +4343,13 @@ main (int argc, char **argv) if (opt.batch) { if (argc > 1) - wrong_args ("--full-gen-key [parameterfile]"); + wrong_args ("--full-generate-key [parameterfile]"); generate_keypair (ctrl, 1, argc? *argv : NULL, NULL, 0); } else { if (argc) - wrong_args("--full-gen-key"); + wrong_args("--full-generate-key"); generate_keypair (ctrl, 1, NULL, NULL, 0); } break; diff --git a/g10/keygen.c b/g10/keygen.c index 9fa4a0708..b4fddba00 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -4319,7 +4319,7 @@ generate_keypair (ctrl_t ctrl, int full, const char *fname, #else GPG_NAME #endif - , "--full-gen-key" ); + , "--full-generate-key" ); err = parse_key_parameter_string (NULL, -1, &algo, &size, &keyuse, &curve, |