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-file.c | |
| 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-file.c')
| -rw-r--r-- | kbx/keybox-file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kbx/keybox-file.c b/kbx/keybox-file.c index 1ed51696e..98808ed4f 100644 --- a/kbx/keybox-file.c +++ b/kbx/keybox-file.c @@ -154,7 +154,7 @@ _keybox_write_header_blob (FILE *fp, int for_openpgp) /* Length of this blob. */ image[3] = 32; - image[4] = BLOBTYPE_HEADER; + image[4] = KEYBOX_BLOBTYPE_HEADER; image[5] = 1; /* Version */ if (for_openpgp) image[7] = 0x02; /* OpenPGP data may be available. */ |