aboutsummaryrefslogtreecommitdiffstats
path: root/g10/gpg.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2017-03-31 18:44:05 +0000
committerWerner Koch <[email protected]>2017-03-31 19:27:16 +0000
commit5556eca5acd46983bff0b38a1ffbc2f07fbaba9f (patch)
tree5bf542ac76662ed10a5b7bf9d4d7db69c7656ae3 /g10/gpg.c
parentgpg: Pass CTRL also to getkey_end. (diff)
downloadgnupg-5556eca5acd46983bff0b38a1ffbc2f07fbaba9f.tar.gz
gnupg-5556eca5acd46983bff0b38a1ffbc2f07fbaba9f.zip
gpg: Avoid multiple open calls to the keybox file.
* g10/keydb.h (KEYDB_HANDLE): Move typedef to ... * g10/gpg.h: here. (struct server_control_s): Add field 'cached_getkey_kdb'. * g10/gpg.c (gpg_deinit_default_ctrl): Release that keydb handle. * g10/getkey.c (getkey_end): Cache keydb handle. (get_pubkey): Use cached keydb handle. * kbx/keybox-search.c (keybox_search_reset): Use lseek instead of closing the file. -- Before this patch a "gpg --check-sigs" opened and closed the keybox file for almost every signature check. By caching the keydb handle and using lseek(2) this can be limited to just 2 times. This might speed up things on Windows. Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/gpg.c')
-rw-r--r--g10/gpg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/g10/gpg.c b/g10/gpg.c
index 24636aa7f..e228427d9 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -2195,6 +2195,8 @@ gpg_deinit_default_ctrl (ctrl_t ctrl)
tofu_closedbs (ctrl);
#endif
gpg_dirmngr_deinit_session_data (ctrl);
+
+ keydb_release (ctrl->cached_getkey_kdb);
}