diff options
author | Werner Koch <wk@gnupg.org> | 2020-09-03 13:46:54 +0200 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2020-09-03 13:49:20 +0200 |
commit | 046f419f806036248c058c4bd44368f8596287b7 (patch) | |
tree | 710c3a2d3d4d0335ea38a60e7a7c18caefeb33e8 /sm/server.c | |
parent | sm: Add arg ctrl to keydb_new. (diff) | |
download | gnupg2-046f419f806036248c058c4bd44368f8596287b7.tar.xz gnupg2-046f419f806036248c058c4bd44368f8596287b7.zip |
sm: New options to prepare the use of keyboxd.
* sm/Makefile.am (AM_CFLAGS): Add npth flags.
(common_libs): Use npth version of the lib.
(gpgsm_LDADD): Add npth libs.
* sm/gpgsm.c (oUseKeyboxd, oKeyboxdProgram): New.
(opts): New options --use-keyboxd and --keyboxd-program.
(main): Set them.
(gpgsm_deinit_default_ctrl): New.
(main): Call it.
* sm/server.c (gpgsm_server): Ditto.
* sm/gpgsm.h (opt): Add fields use_keyboxd and keyboxd_program.
(keydb_local_s): New type.
(struct server_control_s): Add field keybd_local.
* sm/keydb.c: Include assuan.h, asshelp.h, and kbx-client-util.h.
(struct keydb_local_s): New.
(struct keydb_handle): Add fields for keyboxd use.
(gpgsm_keydb_deinit_session_data): New.
(warn_version_mismatch): New.
(create_new_context): New.
(open_context): New.
(keydb_new): Implement keyboxd mode.
(keydb_release): Ditto.
(keydb_get_resource_name): Ditto.
* sm/keydb.c: Add stub support for all other functions.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'sm/server.c')
-rw-r--r-- | sm/server.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sm/server.c b/sm/server.c index 5e4b6538b..874f0db89 100644 --- a/sm/server.c +++ b/sm/server.c @@ -1450,6 +1450,8 @@ gpgsm_server (certlist_t default_recplist) audit_release (ctrl.audit); ctrl.audit = NULL; + gpgsm_deinit_default_ctrl (&ctrl); + assuan_release (ctx); } |