aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2024-12-16 00:56:24 +0000
committerWerner Koch <[email protected]>2025-03-14 12:22:14 +0000
commitcc3efe9a7312b1ca2c2398e439178e0b23e857df (patch)
treececfa2c1c131a73941cbbc26a27dc04c7d25cd26
parentgpg: Fix double free of internal data. (diff)
downloadgnupg-cc3efe9a7312b1ca2c2398e439178e0b23e857df.tar.gz
gnupg-cc3efe9a7312b1ca2c2398e439178e0b23e857df.zip
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 <[email protected]>
-rw-r--r--NEWS3
-rw-r--r--g10/keygen.c2
2 files changed, 4 insertions, 1 deletions
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);