From 7de74320767d15d915942a98ff47c00175a078ed Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Fri, 10 Jun 2016 16:15:34 -0400 Subject: 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 --- g10/export.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'g10/export.c') 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); -- cgit v1.2.3