diff options
| author | Werner Koch <[email protected]> | 2019-03-14 13:55:06 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2019-03-14 13:55:06 +0000 |
| commit | bdda31a26bc69b6ee72e964510db113645de76ef (patch) | |
| tree | e4e9f9b71a4b3a6cf64821f33f851bd2fcc559a4 /g10/delkey.c | |
| parent | gpg: Make rfc4880bis the default. (diff) | |
| download | gnupg-bdda31a26bc69b6ee72e964510db113645de76ef.tar.gz gnupg-bdda31a26bc69b6ee72e964510db113645de76ef.zip | |
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 <[email protected]>
Diffstat (limited to 'g10/delkey.c')
| -rw-r--r-- | g10/delkey.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/g10/delkey.c b/g10/delkey.c index b4d643f59..cc5673846 100644 --- a/g10/delkey.c +++ b/g10/delkey.c @@ -69,10 +69,7 @@ do_delete_key (ctrl_t ctrl, const char *username, int secret, int force, /* Search the userid. */ err = classify_user_id (username, &desc, 1); - exactmatch = (desc.mode == KEYDB_SEARCH_MODE_FPR - || desc.mode == KEYDB_SEARCH_MODE_FPR16 - || desc.mode == KEYDB_SEARCH_MODE_FPR20 - || desc.mode == KEYDB_SEARCH_MODE_FPR32); + exactmatch = (desc.mode == KEYDB_SEARCH_MODE_FPR); if (!err) err = keydb_search (hd, &desc, 1, NULL); if (err) |