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/kbxutil.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/kbxutil.c')
| -rw-r--r-- | kbx/kbxutil.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kbx/kbxutil.c b/kbx/kbxutil.c index 609429884..08892310f 100644 --- a/kbx/kbxutil.c +++ b/kbx/kbxutil.c @@ -411,8 +411,7 @@ import_openpgp (const char *filename, int dryrun) dump_openpgp_key (&info, p); else { - err = _keybox_create_openpgp_blob (&blob, &info, p, nparsed, - NULL, 0); + err = _keybox_create_openpgp_blob (&blob, &info, p, nparsed, 0); if (err) { fflush (stdout); |