diff options
author | Werner Koch <[email protected]> | 2010-09-01 11:07:16 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2010-09-01 11:07:16 +0000 |
commit | 31bc3c8eddd53e0ca088bebf26b9173f2450e27b (patch) | |
tree | ae78047fe9da63ea906f7e66f93b2d521eb01f91 /agent/findkey.c | |
parent | Use passphrase caching for import and genkey. (diff) | |
download | gnupg-31bc3c8eddd53e0ca088bebf26b9173f2450e27b.tar.gz gnupg-31bc3c8eddd53e0ca088bebf26b9173f2450e27b.zip |
s/CACHE_MODE_IMPGEN/CACHE_MODE_NONCE/.
Prepare for more use cases of the cache nonce.
Diffstat (limited to 'agent/findkey.c')
-rw-r--r-- | agent/findkey.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/agent/findkey.c b/agent/findkey.c index 76221119e..c3336620b 100644 --- a/agent/findkey.c +++ b/agent/findkey.c @@ -480,11 +480,13 @@ read_key_file (const unsigned char *grip, gcry_sexp_t *result) CACHE_MODE defines now the cache shall be used. DESC_TEXT may be set to present a custom description for the pinentry. LOOKUP_TTL is an optional function to convey a TTL to the cache manager; we do - not simply pass the TTL value because the value is only needed if an - unprotect action was needed and looking up the TTL may have some - overhead (e.g. scanning the sshcontrol file). */ + not simply pass the TTL value because the value is only needed if + an unprotect action was needed and looking up the TTL may have some + overhead (e.g. scanning the sshcontrol file). If a CACHE_NONCE is + given that cache item is first tried to get a passphrase. */ gpg_error_t -agent_key_from_file (ctrl_t ctrl, const char *desc_text, +agent_key_from_file (ctrl_t ctrl, const char *cache_nonce, + const char *desc_text, const unsigned char *grip, unsigned char **shadow_info, cache_mode_t cache_mode, lookup_ttl_t lookup_ttl, gcry_sexp_t *result) |