diff options
| author | Werner Koch <[email protected]> | 2018-03-27 06:48:00 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2018-03-27 06:48:00 +0000 |
| commit | d4dc4245bf0221d2db4118718fc2528ecf43b97b (patch) | |
| tree | 5912abc9b9ba056a882bcd933105ba4dde73c560 /agent/genkey.c | |
| parent | Change license of argparse.c back to LGPLv2.1 (diff) | |
| parent | agent: Make the request origin a part of the cache items. (diff) | |
| download | gnupg-d4dc4245bf0221d2db4118718fc2528ecf43b97b.tar.gz gnupg-d4dc4245bf0221d2db4118718fc2528ecf43b97b.zip | |
Merge branch 'STABLE-BRANCH-2-2' into master
Diffstat (limited to 'agent/genkey.c')
| -rw-r--r-- | agent/genkey.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/agent/genkey.c b/agent/genkey.c index a3e37ee3a..d5c80d0aa 100644 --- a/agent/genkey.c +++ b/agent/genkey.c @@ -468,7 +468,7 @@ agent_genkey (ctrl_t ctrl, const char *cache_nonce, passphrase = NULL; else { - passphrase_buffer = agent_get_cache (cache_nonce, CACHE_MODE_NONCE); + passphrase_buffer = agent_get_cache (ctrl, cache_nonce, CACHE_MODE_NONCE); passphrase = passphrase_buffer; } @@ -528,7 +528,7 @@ agent_genkey (ctrl_t ctrl, const char *cache_nonce, } if (cache_nonce && !no_protection - && !agent_put_cache (cache_nonce, CACHE_MODE_NONCE, + && !agent_put_cache (ctrl, cache_nonce, CACHE_MODE_NONCE, passphrase, ctrl->cache_ttl_opt_preset)) agent_write_status (ctrl, "CACHE_NONCE", cache_nonce, NULL); if (preset && !no_protection) @@ -538,7 +538,7 @@ agent_genkey (ctrl_t ctrl, const char *cache_nonce, if (gcry_pk_get_keygrip (s_private, grip)) { bin2hex(grip, 20, hexgrip); - rc = agent_put_cache (hexgrip, CACHE_MODE_ANY, passphrase, + rc = agent_put_cache (ctrl, hexgrip, CACHE_MODE_ANY, passphrase, ctrl->cache_ttl_opt_preset); } } |