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 --- g10/export.c | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'g10/export.c') diff --git a/g10/export.c b/g10/export.c index 2d34c8244..4f6c9137e 100644 --- a/g10/export.c +++ b/g10/export.c @@ -451,9 +451,6 @@ exact_subkey_match_p (KEYDB_SEARCH_DESC *desc, KBNODE node) keyid_from_pk (node->pkt->pkt.public_key, kid); break; - case KEYDB_SEARCH_MODE_FPR16: - case KEYDB_SEARCH_MODE_FPR20: - case KEYDB_SEARCH_MODE_FPR32: case KEYDB_SEARCH_MODE_FPR: fingerprint_from_pk (node->pkt->pkt.public_key, fpr, &fprlen); break; @@ -474,21 +471,6 @@ exact_subkey_match_p (KEYDB_SEARCH_DESC *desc, KBNODE node) result = 1; break; - case KEYDB_SEARCH_MODE_FPR16: - if (fprlen == 16 && !memcmp (desc->u.fpr, fpr, 16)) - result = 1; - break; - - case KEYDB_SEARCH_MODE_FPR20: - if (fprlen == 20 && !memcmp (desc->u.fpr, fpr, 20)) - result = 1; - break; - - case KEYDB_SEARCH_MODE_FPR32: - if (fprlen == 32 && !memcmp (desc->u.fpr, fpr, 32)) - result = 1; - break; - case KEYDB_SEARCH_MODE_FPR: if (fprlen == desc->fprlen && !memcmp (desc->u.fpr, fpr, desc->fprlen)) result = 1; -- cgit v1.2.3