diff options
| author | Justus Winter <[email protected]> | 2016-07-18 10:51:38 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2016-07-18 10:51:38 +0000 |
| commit | f474249366e8e143c8e6eb7f7b1a74056e46fa1f (patch) | |
| tree | c0c74ceda31546bcd8f2797ca8b77350fb8c1551 /agent/cache.c | |
| parent | build: Always build gpgtar. (diff) | |
| download | gnupg-f474249366e8e143c8e6eb7f7b1a74056e46fa1f.tar.gz gnupg-f474249366e8e143c8e6eb7f7b1a74056e46fa1f.zip | |
agent: Fix passphrase cache lookups.
CACHE_MODE_ANY is supposed to match any cache mode except
CACHE_MODE_IGNORE, but the code used '==' to compare cache modes.
* agent/cache.c (cache_mode_equal): New function.
(agent_set_cache): Use the new function to compare cache modes.
(agent_get_cache): Likewise.
* tests/openpgp/Makefile.am (TESTS): Add new test.
* tests/openpgp/issue2015.scm: New file.
GnuPG-bug-id: 2015
Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to 'agent/cache.c')
| -rw-r--r-- | agent/cache.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/agent/cache.c b/agent/cache.c index 3fffd2db6..83107a6c9 100644 --- a/agent/cache.c +++ b/agent/cache.c @@ -299,6 +299,15 @@ agent_flush_cache (void) } +/* Compare two cache modes. */ +static int +cache_mode_equal (cache_mode_t a, cache_mode_t b) +{ + /* CACHE_MODE_ANY matches any mode other than CACHE_MODE_IGNORE. */ + return ((a == CACHE_MODE_ANY && b != CACHE_MODE_IGNORE) + || (b == CACHE_MODE_ANY && a != CACHE_MODE_IGNORE) || a == b); +} + /* Store the string DATA in the cache under KEY and mark it with a maximum lifetime of TTL seconds. If there is already data under @@ -333,7 +342,7 @@ agent_put_cache (const char *key, cache_mode_t cache_mode, { if (((cache_mode != CACHE_MODE_USER && cache_mode != CACHE_MODE_NONCE) - || r->cache_mode == cache_mode) + || cache_mode_equal (r->cache_mode, cache_mode)) && !strcmp (r->key, key)) break; } @@ -416,7 +425,7 @@ agent_get_cache (const char *key, cache_mode_t cache_mode) if (r->pw && ((cache_mode != CACHE_MODE_USER && cache_mode != CACHE_MODE_NONCE) - || r->cache_mode == cache_mode) + || cache_mode_equal (r->cache_mode, cache_mode)) && !strcmp (r->key, key)) { /* Note: To avoid races KEY may not be accessed anymore below. */ |