From 935edf88ab29b2f63afc2a0e3af1b33c92033ab7 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 31 Oct 2014 12:15:34 +0100 Subject: kbx: Let keydb_search skip unwanted blobs. * kbx/keybox.h (keybox_blobtype_t): New. * kbx/keybox-defs.h (BLOBTYPE_*): Replace by KEYBOX_BLOBTYPE_*. * kbx/keybox-search.c (keybox_search): Add arg want_blobtype and skip non-matching blobs. * sm/keydb.c (keydb_search): Pass KEYBOX_BLOBTYPE_X509 to keybox_search. * g10/keydb.c (keydb_search): Pass KEYBOX_BLOBTYPE_PGP to keybox_search. -- Without this fix a listing of all keys would fail because the wrong blob type would be returned for the gpg or gpgsm. Signed-off-by: Werner Koch --- kbx/keybox-defs.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'kbx/keybox-defs.h') diff --git a/kbx/keybox-defs.h b/kbx/keybox-defs.h index 415a3efff..8d795ab06 100644 --- a/kbx/keybox-defs.h +++ b/kbx/keybox-defs.h @@ -44,14 +44,6 @@ #include "keybox.h" -enum { - BLOBTYPE_EMPTY = 0, - BLOBTYPE_HEADER = 1, - BLOBTYPE_PGP = 2, - BLOBTYPE_X509 = 3 -}; - - typedef struct keyboxblob *KEYBOXBLOB; -- cgit v1.2.3