diff options
| author | Neal H. Walfield <[email protected]> | 2015-09-15 12:45:18 +0000 |
|---|---|---|
| committer | Neal H. Walfield <[email protected]> | 2015-09-16 13:15:25 +0000 |
| commit | 50affffe93a07643f2610c7a5f3d6f61988855e8 (patch) | |
| tree | ae2d6e14272904f7b7c7397b0af71605222ece08 /g10/getkey.c | |
| parent | g10: Remove unused function get_seckeyblock_byfprint. (diff) | |
| download | gnupg-50affffe93a07643f2610c7a5f3d6f61988855e8.tar.gz gnupg-50affffe93a07643f2610c7a5f3d6f61988855e8.zip | |
g10: Don't skip legacy keys if the search mode is KEYDB_SEARCH_MODE_NEXT
* g10/getkey.c (lookup): Also don't skip legacy keys if the search
mode is KEYDB_SEARCH_MODE_NEXT.
--
Signed-off-by: Neal H. Walfield <[email protected]>.
We currently don't skip keys if the search mode is
KEYDB_SEARCH_MODE_FIRST. Since we change KEYDB_SEARCH_MODE_FIRST to
KEYDB_SEARCH_MODE_NEXT (to avoid a reset), it only makes sense to have
the same semantics for KEYDB_SEARCH_MODE_NEXT.
Diffstat (limited to 'g10/getkey.c')
| -rw-r--r-- | g10/getkey.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/g10/getkey.c b/g10/getkey.c index 27e2f7a37..7e47b5625 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -2437,7 +2437,8 @@ lookup (getkey_ctx_t ctx, kbnode_t *ret_keyblock, kbnode_t *ret_found_key, then it would be harder to report the number of skipped legacy keys during import. */ if (gpg_err_code (rc) == GPG_ERR_LEGACY_KEY - && !(ctx->nitems && ctx->items->mode == KEYDB_SEARCH_MODE_FIRST) + && !(ctx->nitems && (ctx->items->mode == KEYDB_SEARCH_MODE_FIRST + || ctx->items->mode == KEYDB_SEARCH_MODE_NEXT)) && !search_modes_are_fingerprint (ctx)) continue; if (rc) |