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-update.c | |
| 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-update.c')
| -rw-r--r-- | kbx/keybox-update.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/kbx/keybox-update.c b/kbx/keybox-update.c index 31171dea4..0b0f56bce 100644 --- a/kbx/keybox-update.c +++ b/kbx/keybox-update.c @@ -353,12 +353,9 @@ blob_filecopy (int mode, const char *fname, KEYBOXBLOB blob, } -/* Insert the OpenPGP keyblock {IMAGE,IMAGELEN} into HD. SIGSTATUS is - a vector describing the status of the signatures; its first element - gives the number of following elements. */ +/* Insert the OpenPGP keyblock {IMAGE,IMAGELEN} into HD. */ gpg_error_t -keybox_insert_keyblock (KEYBOX_HANDLE hd, const void *image, size_t imagelen, - u32 *sigstatus) +keybox_insert_keyblock (KEYBOX_HANDLE hd, const void *image, size_t imagelen) { gpg_error_t err; const char *fname; @@ -385,7 +382,7 @@ keybox_insert_keyblock (KEYBOX_HANDLE hd, const void *image, size_t imagelen, return err; assert (nparsed <= imagelen); err = _keybox_create_openpgp_blob (&blob, &info, image, imagelen, - sigstatus, hd->ephemeral); + hd->ephemeral); _keybox_destroy_openpgp_info (&info); if (!err) { @@ -436,7 +433,7 @@ keybox_update_keyblock (KEYBOX_HANDLE hd, const void *image, size_t imagelen) return err; assert (nparsed <= imagelen); err = _keybox_create_openpgp_blob (&blob, &info, image, imagelen, - NULL, hd->ephemeral); + hd->ephemeral); _keybox_destroy_openpgp_info (&info); /* Update the keyblock. */ |