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/call-agent.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'g10/call-agent.h') diff --git a/g10/call-agent.h b/g10/call-agent.h index a5d01e65b..d85a6fd5d 100644 --- a/g10/call-agent.h +++ b/g10/call-agent.h @@ -192,7 +192,8 @@ gpg_error_t agent_import_key (ctrl_t ctrl, const char *desc, /* Receive a key from the agent. */ gpg_error_t agent_export_key (ctrl_t ctrl, const char *keygrip, - const char *desc, char **cache_nonce_addr, + const char *desc, int openpgp_protected, + char **cache_nonce_addr, unsigned char **r_result, size_t *r_resultlen); /* Delete a key from the agent. */ -- cgit v1.2.3