diff options
| author | Justus Winter <[email protected]> | 2016-07-22 11:29:26 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2016-07-22 12:17:24 +0000 |
| commit | d9839c9d303a01dc1032a6de311e034fe14e81da (patch) | |
| tree | 8434eab8d12950dc881a787a5d781fc367f6f4a0 /g10/keyring.c | |
| parent | g10: Fix error handling. (diff) | |
| download | gnupg-d9839c9d303a01dc1032a6de311e034fe14e81da.tar.gz gnupg-d9839c9d303a01dc1032a6de311e034fe14e81da.zip | |
g10: Properly ignore legacy keys in the keyring cache.
* g10/keyring.c (keyring_rebuild_cache): Properly ignore legacy keys
in the keyring cache.
* tests/migrations/Makefile.am (TESTS): Add new test.
* tests/migrations/common.scm (GPG-no-batch): New variable.
(run-test): New function.
* tests/migrations/issue2276.scm: New file.
* tests/migrations/issue2276.tar.asc: Likewise.
GnuPG-bug-id: 2276
Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to 'g10/keyring.c')
| -rw-r--r-- | g10/keyring.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/g10/keyring.c b/g10/keyring.c index 843975eaf..0611b2eb9 100644 --- a/g10/keyring.c +++ b/g10/keyring.c @@ -1455,7 +1455,7 @@ keyring_rebuild_cache (void *token,int noisy) for (;;) { - rc = keyring_search (hd, &desc, 1, NULL, 0); + rc = keyring_search (hd, &desc, 1, NULL, 1 /* ignore_legacy */); if (rc) break; /* ready. */ @@ -1492,9 +1492,6 @@ keyring_rebuild_cache (void *token,int noisy) goto leave; } - if (gpg_err_code (rc) == GPG_ERR_LEGACY_KEY) - continue; - release_kbnode (keyblock); rc = keyring_get_keyblock (hd, &keyblock); if (rc) |