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 /kbx/Makefile.am | |
| 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 'kbx/Makefile.am')
| -rw-r--r-- | kbx/Makefile.am | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kbx/Makefile.am b/kbx/Makefile.am index 242e373a6..fe72860e9 100644 --- a/kbx/Makefile.am +++ b/kbx/Makefile.am @@ -57,9 +57,13 @@ common_sources = \ keybox-openpgp.c \ keybox-dump.c +client_sources = \ + kbx-client-util.h \ + kbx-client-util.c -libkeybox_a_SOURCES = $(common_sources) -libkeybox509_a_SOURCES = $(common_sources) + +libkeybox_a_SOURCES = $(common_sources) $(client_sources) +libkeybox509_a_SOURCES = $(common_sources) $(client_sources) libkeybox_a_CFLAGS = $(AM_CFLAGS) libkeybox509_a_CFLAGS = $(AM_CFLAGS) -DKEYBOX_WITH_X509=1 |