diff options
| author | NIIBE Yutaka <[email protected]> | 2023-04-25 04:47:49 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2023-09-06 00:27:11 +0000 |
| commit | 8a1e123a36e03957cc2a3c2866454a756e807714 (patch) | |
| tree | 0a62b2bf8d403249e0a17ec93f66a7fafcf225c3 | |
| parent | gpg: Allow overridden key import when stub exists. (diff) | |
| download | gnupg-8a1e123a36e03957cc2a3c2866454a756e807714.tar.gz gnupg-8a1e123a36e03957cc2a3c2866454a756e807714.zip | |
gpg: Fix for overridden key import.
* g10/import.c (do_transfer): Force the overridden key import
even when smartcard is available.
--
Cherry picked from 2.4 branch:
0ec10fbd0d4007997cec59da9a514797bc0531a8
Fixes-commit: 2c1297055041b4657ea1a927acac978c2b09a483
GnuPG-bug-id: 3456
Signed-off-by: NIIBE Yutaka <[email protected]>
| -rw-r--r-- | g10/import.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/import.c b/g10/import.c index f11dedc8b..49a363c28 100644 --- a/g10/import.c +++ b/g10/import.c @@ -2839,7 +2839,7 @@ do_transfer (ctrl_t ctrl, kbnode_t keyblock, PKT_public_key *pk, int force = 0; int already_exist = agent_probe_secret_key (ctrl, pk); - if (already_exist == 2) + if (already_exist == 2 || already_exist == 4) { if (!opt.quiet) log_info (_("key %s: card reference is overridden by key material\n"), |