From bdda31a26bc69b6ee72e964510db113645de76ef Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 14 Mar 2019 14:55:06 +0100 Subject: kbx: Unify the fingerprint search modes. * kbx/keybox-search-desc.h (KEYDB_SEARCH_MODE_FPR16) (KEYDB_SEARCH_MODE_FPR20, KEYDB_SEARCH_MODE_FPR32): Remove. Switch all users to KEYDB_SEARCH_MODE_FPR along with the fprlen value. -- These search modes were added over time and there has until recently be no incentive to remove the cruft. With the change for v5 keys I finally went over all places and allowed the generic fingerprint mode along with a given length of the fingerprint at all places. Consequently the other modes can now be removed. Signed-off-by: Werner Koch --- kbx/keybox-search.c | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'kbx/keybox-search.c') diff --git a/kbx/keybox-search.c b/kbx/keybox-search.c index db98648f4..101e1b5ea 100644 --- a/kbx/keybox-search.c +++ b/kbx/keybox-search.c @@ -1083,18 +1083,6 @@ keybox_search (KEYBOX_HANDLE hd, KEYBOX_SEARCH_DESC *desc, size_t ndesc, goto found; break; - case KEYDB_SEARCH_MODE_FPR20: - pk_no = has_fingerprint (blob, desc[n].u.fpr, 20); - if (pk_no) - goto found; - break; - - case KEYDB_SEARCH_MODE_FPR32: - pk_no = has_fingerprint (blob, desc[n].u.fpr, 32); - if (pk_no) - goto found; - break; - case KEYDB_SEARCH_MODE_KEYGRIP: if (has_keygrip (blob, desc[n].u.grip)) goto found; -- cgit v1.2.3