diff options
author | Daniel Kahn Gillmor <[email protected]> | 2016-06-10 20:15:34 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2016-06-11 09:14:00 +0000 |
commit | 7de74320767d15d915942a98ff47c00175a078ed (patch) | |
tree | 788ecee37255ac2eb8c0628815d6aa0e8c0965d6 /g10/export.c | |
parent | g10: report whether key in agent is passphrase-protected or not (diff) | |
download | gnupg-7de74320767d15d915942a98ff47c00175a078ed.tar.gz gnupg-7de74320767d15d915942a98ff47c00175a078ed.zip |
g10: Add openpgp_protected flag to agent secret key export functions
* g10/call-agent.c, g10/call-agent.h (agent_export_key): Add
openpgp_protected flag.
* g10/export.c (receive_seckey_from_agent): Request openpgp_protected
secret keys from agent.
* agent/command.c (hlp_export_key): EXPORT_KEY help text: add a
brief description of the effect of --openpgp.
--
The --openpgp flag for gpg-agent's EXPORT_KEY actually forces
encryption in a certain (RFC 4880-compatible format). This changeset
exposes that functionality in internal functions, and clarifies
functionality in the agent's help text.
Signed-off-by: Daniel Kahn Gillmor <[email protected]>
Diffstat (limited to 'g10/export.c')
-rw-r--r-- | g10/export.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/export.c b/g10/export.c index d47c27d23..5b161ae8e 100644 --- a/g10/export.c +++ b/g10/export.c @@ -852,7 +852,7 @@ receive_seckey_from_agent (ctrl_t ctrl, gcry_cipher_hd_t cipherhd, log_info ("key %s: asking agent for the secret parts\n", hexgrip); prompt = gpg_format_keydesc (pk, FORMAT_KEYDESC_EXPORT,1); - err = agent_export_key (ctrl, hexgrip, prompt, cache_nonce_addr, + err = agent_export_key (ctrl, hexgrip, prompt, 1, cache_nonce_addr, &wrappedkey, &wrappedkeylen); xfree (prompt); |