From cc3efe9a7312b1ca2c2398e439178e0b23e857df Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Mon, 16 Dec 2024 09:56:24 +0900 Subject: [PATCH] gpg: Fix key generation with existing key from card. * g10/keygen.c (ask_algo): Fix condition. Continue the loop when failure. -- Fixes-commit: 6022f10da39e512b5b3fed3869fd6579d954090c GnuPG-bug-id: 7309, 7457 Signed-off-by: NIIBE Yutaka --- NEWS | 3 +++ g10/keygen.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index e5f308ab0..6bbc05b62 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,9 @@ Noteworthy changes in version 2.4.8 (unreleased) * gpg: Fix a verification DoS due to a malicious subkey in the keyring. [T7527] + * gpg: Fix a regression in 2.4.7 for generating a key from card. + [T7457] + Release-info: https://dev.gnupg.org/T7428 diff --git a/g10/keygen.c b/g10/keygen.c index be594cfa4..d0c50158f 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -2515,7 +2515,7 @@ ask_algo (ctrl_t ctrl, int addmode, int *r_subkey_algo, unsigned int *r_usage, if (!keyref) continue; - if (!agent_scd_readkey (ctrl, keyref, &s_pkey, NULL)) + if (agent_scd_readkey (ctrl, keyref, &s_pkey, NULL)) continue; algostr = pubkey_algo_string (s_pkey, &algoid);