diff options
author | NIIBE Yutaka <[email protected]> | 2023-04-25 04:47:49 +0000 |
---|---|---|
committer | NIIBE Yutaka <[email protected]> | 2023-04-25 04:47:49 +0000 |
commit | 0ec10fbd0d4007997cec59da9a514797bc0531a8 (patch) | |
tree | f80db99671d1c0cf0e7d064510701a89bcc7ae02 | |
parent | gpg: Fix writing ECDH keys to OpenPGP smartcards. (diff) | |
download | gnupg-0ec10fbd0d4007997cec59da9a514797bc0531a8.tar.gz gnupg-0ec10fbd0d4007997cec59da9a514797bc0531a8.zip |
gpg: Fix for overridden key import.
* g10/import.c (do_transfer): Force the overridden key import
even when smartcard is available.
--
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 7b46d8941..5e44942e7 100644 --- a/g10/import.c +++ b/g10/import.c @@ -2958,7 +2958,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"), |