diff options
| author | Werner Koch <[email protected]> | 2014-10-31 11:15:34 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-10-31 11:15:34 +0000 |
| commit | 935edf88ab29b2f63afc2a0e3af1b33c92033ab7 (patch) | |
| tree | eed38381131b8d98f4aa95a2a6aa9227ec576699 /kbx/keybox-defs.h | |
| parent | gpg: Fix --rebuild-keydb-caches. (diff) | |
| download | gnupg-935edf88ab29b2f63afc2a0e3af1b33c92033ab7.tar.gz gnupg-935edf88ab29b2f63afc2a0e3af1b33c92033ab7.zip | |
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 <[email protected]>
Diffstat (limited to 'kbx/keybox-defs.h')
| -rw-r--r-- | kbx/keybox-defs.h | 8 |
1 files changed, 0 insertions, 8 deletions
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; |