diff options
| author | Werner Koch <wk@gnupg.org> | 2020-09-02 15:05:44 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2020-09-02 15:16:29 +0200 |
| commit | 497db0b5bcd688c4e2144ba167bd2ac485069d1b (patch) | |
| tree | d5389aec8f4564500e5cc1d76f931d9892e61861 /g10/keydb.c | |
| parent | keyboxd: Fix user id based queries (diff) | |
| download | gnupg2-497db0b5bcd688c4e2144ba167bd2ac485069d1b.tar.xz gnupg2-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 <wk@gnupg.org>
Diffstat (limited to 'g10/keydb.c')
| -rw-r--r-- | g10/keydb.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/g10/keydb.c b/g10/keydb.c index 15291f307..ef56885bd 100644 --- a/g10/keydb.c +++ b/g10/keydb.c @@ -1136,8 +1136,9 @@ keydb_pop_found_state (KEYDB_HANDLE hd) -static gpg_error_t -parse_keyblock_image (iobuf_t iobuf, int pk_no, int uid_no, +/* Parse the keyblock in IOBUF and return at R_KEYBLOCK. */ +gpg_error_t +keydb_parse_keyblock (iobuf_t iobuf, int pk_no, int uid_no, kbnode_t *r_keyblock) { gpg_error_t err; @@ -1300,7 +1301,7 @@ internal_keydb_get_keyblock (KEYDB_HANDLE hd, KBNODE *ret_kb) } else { - err = parse_keyblock_image (hd->keyblock_cache.iobuf, + err = keydb_parse_keyblock (hd->keyblock_cache.iobuf, hd->keyblock_cache.pk_no, hd->keyblock_cache.uid_no, ret_kb); @@ -1332,7 +1333,7 @@ internal_keydb_get_keyblock (KEYDB_HANDLE hd, KBNODE *ret_kb) &iobuf, &pk_no, &uid_no); if (!err) { - err = parse_keyblock_image (iobuf, pk_no, uid_no, ret_kb); + err = keydb_parse_keyblock (iobuf, pk_no, uid_no, ret_kb); if (!err && hd->keyblock_cache.state == KEYBLOCK_CACHE_PREPARED) { hd->keyblock_cache.state = KEYBLOCK_CACHE_FILLED; |