From 872137b5921dd297e7d2c1def6e3868b7595feb5 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Mon, 24 Jul 2017 17:18:42 +0200 Subject: g10: Make sure to emit NEED_PASSPHRASE on --import of secret key. * call-agent.h (agent_import_key): Add keyid parameters. * call-agent.c (agent_import_key): Set keyid parameters. * import.c (transfer_secret_keys): Pass keyid parameters. Signed-off-by: Marcus Brinkmann GnuPG-bug-id: 2667 --- g10/import.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'g10/import.c') diff --git a/g10/import.c b/g10/import.c index 02440ffd8..c87f49b06 100644 --- a/g10/import.c +++ b/g10/import.c @@ -2109,7 +2109,8 @@ transfer_secret_keys (ctrl_t ctrl, struct import_stats_s *stats, { char *desc = gpg_format_keydesc (ctrl, pk, FORMAT_KEYDESC_IMPORT, 1); err = agent_import_key (ctrl, desc, &cache_nonce, - wrappedkey, wrappedkeylen, batch, force); + wrappedkey, wrappedkeylen, batch, force, + pk->keyid, pk->main_keyid, pk->pubkey_algo); xfree (desc); } if (!err) -- cgit v1.2.3