diff options
author | Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de> | 2017-07-24 16:03:25 +0200 |
---|---|---|
committer | Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de> | 2017-07-24 16:03:25 +0200 |
commit | d8e46f10698da0bee4cd58d95f1f9832bdda0c5f (patch) | |
tree | 05e314438ad7886b8983e206ed228307dd69ea6f /g10/export.c | |
parent | doc: Revert the bug reporting address to bugs.gnupg.org (diff) | |
download | gnupg2-d8e46f10698da0bee4cd58d95f1f9832bdda0c5f.tar.xz gnupg2-d8e46f10698da0bee4cd58d95f1f9832bdda0c5f.zip |
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 <mb@g10code.com>
GnuPG-bug-id: 2667
Diffstat (limited to 'g10/export.c')
-rw-r--r-- | g10/export.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/g10/export.c b/g10/export.c index ce79a2ffd..8f6371b30 100644 --- a/g10/export.c +++ b/g10/export.c @@ -1190,7 +1190,8 @@ receive_seckey_from_agent (ctrl_t ctrl, gcry_cipher_hd_t cipherhd, prompt = gpg_format_keydesc (ctrl, pk, FORMAT_KEYDESC_EXPORT,1); err = agent_export_key (ctrl, hexgrip, prompt, !cleartext, cache_nonce_addr, - &wrappedkey, &wrappedkeylen); + &wrappedkey, &wrappedkeylen, + pk->keyid, pk->main_keyid, pk->pubkey_algo); xfree (prompt); if (err) |