diff options
| author | Werner Koch <[email protected]> | 2016-09-14 07:46:10 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-09-14 07:46:10 +0000 |
| commit | 0fd332bc1f6f1f10c96da0cc91203925d3ac81eb (patch) | |
| tree | 564c1ee55e22e47ac0a20faaebb4f846ef239971 | |
| parent | gpg: Improve usability of --quick-gen-key. (diff) | |
| download | gnupg-0fd332bc1f6f1f10c96da0cc91203925d3ac81eb.tar.gz gnupg-0fd332bc1f6f1f10c96da0cc91203925d3ac81eb.zip | |
gpg: Allow use of "default" algo for--quick-addkey.
* g10/keygen.c (quick_generate_keypair): Write a status error.
(parse_algo_usage_expire): Set a default curve.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | g10/keygen.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/g10/keygen.c b/g10/keygen.c index e897075ce..9cf314d29 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -3614,6 +3614,7 @@ quick_generate_keypair (ctrl_t ctrl, const char *uid, const char *algostr, || !cpr_get_answer_is_yes_def ("quick_keygen.force", _("Create anyway? (y/N) "), 0)) { + write_status_error ("genkey", gpg_error (304)); log_inc_errorcount (); /* we used log_info */ goto leave; } @@ -4457,12 +4458,14 @@ parse_algo_usage_expire (ctrl_t ctrl, int for_subkey, algo = for_subkey? DEFAULT_STD_SUBALGO : DEFAULT_STD_ALGO; use = for_subkey? DEFAULT_STD_SUBKEYUSE : DEFAULT_STD_KEYUSE; nbits = for_subkey? DEFAULT_STD_SUBKEYSIZE : DEFAULT_STD_KEYSIZE; + curve = for_subkey? DEFAULT_STD_SUBCURVE : DEFAULT_STD_CURVE; } else if (!strcmp (algostr, "future-default")) { algo = for_subkey? FUTURE_STD_SUBALGO : FUTURE_STD_ALGO; use = for_subkey? FUTURE_STD_SUBKEYUSE : FUTURE_STD_KEYUSE; nbits = for_subkey? FUTURE_STD_SUBKEYSIZE : FUTURE_STD_KEYSIZE; + curve = for_subkey? FUTURE_STD_SUBCURVE : FUTURE_STD_CURVE; } else if (*algostr == '&' && strlen (algostr) == 41) { |