From 50affffe93a07643f2610c7a5f3d6f61988855e8 Mon Sep 17 00:00:00 2001 From: "Neal H. Walfield" Date: Tue, 15 Sep 2015 14:45:18 +0200 Subject: [PATCH] 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 . 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. --- g10/getkey.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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)