diff options
| author | Werner Koch <[email protected]> | 2017-03-30 13:18:45 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-03-30 14:01:55 +0000 |
| commit | a6142dbdbc5783043deb847dc64998c421860941 (patch) | |
| tree | 15818cfb9c55f560021223162ced17b7e36d3d10 /kbx/keybox.h | |
| parent | gpg: Fix actual leak and possible leaks in the packet parser. (diff) | |
| download | gnupg-a6142dbdbc5783043deb847dc64998c421860941.tar.gz gnupg-a6142dbdbc5783043deb847dc64998c421860941.zip | |
gpg: Remove the use of the signature information from a KBX.
* g10/keydb.c (keyblock_cache): Remove field SIGSTATUS.
(keyblock_cache_clear): Adjust for that removal.
(parse_keyblock_image): Remove arg SIGSTATUS. Remove the signature
cache setting; this is now done in the parser.
(keydb_get_keyblock): Do not set SIGSTATUS.
(build_keyblock_image): Remove arg SIGSTATUS and simplify. Change
caller.
* kbx/keybox-blob.c: Explain that the signature information is not
anymore used.
(_keybox_create_openpgp_blob): Remove arg SIGSTATUS and change
callers.
* kbx/keybox-search.c (keybox_get_keyblock): Remove arg R_SIGSTATUS
and change callers.
* kbx/keybox-update.c (keybox_insert_keyblock): Likewise.
--
This thing was too complicated and has been replaced by the new ring
trust packet code.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'kbx/keybox.h')
| -rw-r--r-- | kbx/keybox.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kbx/keybox.h b/kbx/keybox.h index 5c2824a7f..29884b05f 100644 --- a/kbx/keybox.h +++ b/kbx/keybox.h @@ -85,7 +85,7 @@ int _keybox_write_header_blob (FILE *fp, int openpgp_flag); /*-- keybox-search.c --*/ gpg_error_t keybox_get_keyblock (KEYBOX_HANDLE hd, iobuf_t *r_iobuf, - int *r_uid_no, int *r_pk_no, u32 **sigstatus); + int *r_uid_no, int *r_pk_no); #ifdef KEYBOX_WITH_X509 int keybox_get_cert (KEYBOX_HANDLE hd, ksba_cert_t *ret_cert); #endif /*KEYBOX_WITH_X509*/ @@ -102,8 +102,7 @@ gpg_error_t keybox_seek (KEYBOX_HANDLE hd, off_t offset); /*-- keybox-update.c --*/ gpg_error_t keybox_insert_keyblock (KEYBOX_HANDLE hd, - const void *image, size_t imagelen, - u32 *sigstatus); + const void *image, size_t imagelen); gpg_error_t keybox_update_keyblock (KEYBOX_HANDLE hd, const void *image, size_t imagelen); |