From fa4a2bd7a1ba8d4bda5f9cec0826104f50142d4f Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Mon, 27 Jul 2020 15:30:20 +0900 Subject: [PATCH] kbx: Fix short KID and long KID handling for FPR32. * kbx/keybox-search.c (blob_cmp_fpr_part): For FPR32, it's the first part in the fingerprint. Signed-off-by: NIIBE Yutaka --- kbx/keybox-search.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kbx/keybox-search.c b/kbx/keybox-search.c index 66a383bef..e1e1d0410 100644 --- a/kbx/keybox-search.c +++ b/kbx/keybox-search.c @@ -313,7 +313,7 @@ blob_cmp_fpr_part (KEYBOXBLOB blob, const unsigned char *fpr, storedfprlen = (get16 (buffer + off + 32) & 0x80)? 32:20; else storedfprlen = 20; - if (storedfprlen == fproff + fprlen + if ((fpr32 || storedfprlen == fproff + fprlen) && !memcmp (buffer + off + fproff, fpr, fprlen)) return idx+1; /* found */ }