aboutsummaryrefslogtreecommitdiffstats
path: root/g10/call-agent.h
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <[email protected]>2016-06-10 20:15:34 +0000
committerWerner Koch <[email protected]>2016-06-11 09:14:00 +0000
commit7de74320767d15d915942a98ff47c00175a078ed (patch)
tree788ecee37255ac2eb8c0628815d6aa0e8c0965d6 /g10/call-agent.h
parentg10: report whether key in agent is passphrase-protected or not (diff)
downloadgnupg-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/call-agent.h')
-rw-r--r--g10/call-agent.h3
1 files changed, 2 insertions, 1 deletions
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. */