security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

gpg: Store the Tofu meta handle for databases in CTRL.

Browse source 
* g10/gpg.h (struct tofu_dbs_s, tofu_dbs_t): New declarations.
(struct server_control_s): Add field tofu.dbs.
* g10/tofu.c (struct dbs): Rename to tofu_dbs_s.  Replace all users by
by tofu_dbs_t.
(opendbs):  Add arg CTRL.  Cache the DBS in CTRL.
(closedbs): Rename to tofu_closedbs and make global.  Add arg CTRL.
(tofu_register): Add arg CTRL.  Change all callers.  Do not call
closedbs.
(tofu_get_validity): Ditto.
(tofu_set_policy): Ditto.
(tofu_get_policy): Ditto.
(tofu_set_policy_by_keyid): Add arg CTRL.
* g10/gpg.c (gpg_deinit_default_ctrl): Call tofu_closedbs.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-05-21 12:26:44 +02:00
parent 027c4e5552
commit 754b1c4630
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
9 changed files with 70 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

3
g10/gpg.c
View file

@ -2046,6 +2046,7 @@ gpg_init_default_ctrl (ctrl_t ctrl)
static void
gpg_deinit_default_ctrl (ctrl_t ctrl)
{
tofu_closedbs (ctrl);
gpg_dirmngr_deinit_session_data (ctrl);
}
@ -4586,7 +4587,7 @@ main (int argc, char **argv)
}
merge_keys_and_selfsig (kb);
if (tofu_set_policy (kb, policy))
if (tofu_set_policy (ctrl, kb, policy))
g10_exit (1);
}