diff options
| author | Werner Koch <[email protected]> | 2020-09-02 13:05:44 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2020-09-02 13:16:29 +0000 |
| commit | 497db0b5bcd688c4e2144ba167bd2ac485069d1b (patch) | |
| tree | d5389aec8f4564500e5cc1d76f931d9892e61861 /g10/keydb-private.h | |
| parent | keyboxd: Fix user id based queries (diff) | |
| download | gnupg-497db0b5bcd688c4e2144ba167bd2ac485069d1b.tar.gz gnupg-497db0b5bcd688c4e2144ba167bd2ac485069d1b.zip | |
keyboxd: Restructure client access code.
* kbx/kbx-client-util.c: New.
* kbx/kbx-client-util.h: New.
* kbx/Makefile.am (client_sources): New.
* g10/keydb.c (parse_keyblock_image): Rename to keydb_parse_keyblock
and make global.
* g10/call-keyboxd.c: Include kbx-client-util.h.
(struct keyboxd_local_s): Remove struct datastream. Add field kcd.
Remove per_session_init_done.
(lock_datastream, unlock_datastream): Remove.
(prepare_data_pipe, datastream_thread): Remove.
(keydb_get_keyblock_do_parse): Remove.
(gpg_keyboxd_deinit_session_data): Release the KCD object.
(open_context): Use of kbx_client_data_new.
(keydb_get_keyblock): Simplify.
(keydb_search): Use kbx_client_data_cmd and _wait.
--
The data specific part of the code has been moved from gpg to a new
module in kbx/ so that it can also be used by gpgsm. The OpenPGP
parsing while reading the data has been replaced by storing the data
in memory and parse it later. That makes a nice interface and
abstracts the fd-passing/D-lines handling away.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | g10/keydb-private.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/g10/keydb-private.h b/g10/keydb-private.h index fdc905edf..c54e73f69 100644 --- a/g10/keydb-private.h +++ b/g10/keydb-private.h @@ -154,6 +154,10 @@ struct keydb_handle_s /*-- keydb.c --*/ + +gpg_error_t keydb_parse_keyblock (iobuf_t iobuf, int pk_no, int uid_no, + kbnode_t *r_keyblock); + /* These are the functions call-keyboxd diverts to if the keyboxd is * not used. */ |