From d8e46f10698da0bee4cd58d95f1f9832bdda0c5f Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Mon, 24 Jul 2017 16:03:25 +0200 Subject: g10: Make sure to emit NEED_PASSPHRASE on --export-secret-key. * call-agent.h (agent_export_key): Add keyid parameters. * call-agent.c (agent_export_key): Set keyid parameters. * export.c (receive_seckey_from_agent): Pass keyid parameters. Signed-off-by: Marcus Brinkmann GnuPG-bug-id: 2667 --- g10/call-agent.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'g10/call-agent.c') diff --git a/g10/call-agent.c b/g10/call-agent.c index 3ad13e874..b17c2e65f 100644 --- a/g10/call-agent.c +++ b/g10/call-agent.c @@ -2152,7 +2152,8 @@ agent_import_key (ctrl_t ctrl, const char *desc, char **cache_nonce_addr, gpg_error_t agent_export_key (ctrl_t ctrl, const char *hexkeygrip, const char *desc, int openpgp_protected, char **cache_nonce_addr, - unsigned char **r_result, size_t *r_resultlen) + unsigned char **r_result, size_t *r_resultlen, + u32 *keyid, u32 *mainkeyid, int pubkey_algo) { gpg_error_t err; struct cache_nonce_parm_s cn_parm; @@ -2164,6 +2165,9 @@ agent_export_key (ctrl_t ctrl, const char *hexkeygrip, const char *desc, memset (&dfltparm, 0, sizeof dfltparm); dfltparm.ctrl = ctrl; + dfltparm.keyinfo.keyid = keyid; + dfltparm.keyinfo.mainkeyid = mainkeyid; + dfltparm.keyinfo.pubkey_algo = pubkey_algo; *r_result = NULL; -- cgit v1.2.3