diff options
| -rw-r--r-- | g10/getkey.c | 23 | ||||
| -rw-r--r-- | g10/gpg.c | 2 | ||||
| -rw-r--r-- | g10/gpg.h | 7 | ||||
| -rw-r--r-- | g10/keydb.h | 3 | ||||
| -rw-r--r-- | kbx/keybox-search.c | 9 |
5 files changed, 33 insertions, 11 deletions
diff --git a/g10/getkey.c b/g10/getkey.c index d8a105839..dab63fa5f 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -736,11 +736,21 @@ get_pubkey (ctrl_t ctrl, PKT_public_key * pk, u32 * keyid) memset (&ctx, 0, sizeof ctx); ctx.exact = 1; /* Use the key ID exactly as given. */ ctx.not_allocated = 1; - ctx.kr_handle = keydb_new (); - if (!ctx.kr_handle) + + if (ctrl && ctrl->cached_getkey_kdb) + { + ctx.kr_handle = ctrl->cached_getkey_kdb; + ctrl->cached_getkey_kdb = NULL; + keydb_search_reset (ctx.kr_handle); + } + else { - rc = gpg_error_from_syserror (); - goto leave; + ctx.kr_handle = keydb_new (); + if (!ctx.kr_handle) + { + rc = gpg_error_from_syserror (); + goto leave; + } } ctx.nitems = 1; ctx.items[0].mode = KEYDB_SEARCH_MODE_LONG_KID; @@ -2208,7 +2218,10 @@ getkey_end (ctrl_t ctrl, getkey_ctx_t ctx) { if (ctx) { - keydb_release (ctx->kr_handle); + if (ctrl && !ctrl->cached_getkey_kdb) + ctrl->cached_getkey_kdb = ctx->kr_handle; + else + keydb_release (ctx->kr_handle); free_strlist (ctx->extra_list); if (!ctx->not_allocated) xfree (ctx); @@ -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); } @@ -59,10 +59,13 @@ struct server_local_s; struct dirmngr_local_s; typedef struct dirmngr_local_s *dirmngr_local_t; -/* Object used to describe a keyblok node. */ +/* Object used to describe a keyblock node. */ typedef struct kbnode_struct *KBNODE; /* Deprecated use kbnode_t. */ typedef struct kbnode_struct *kbnode_t; +/* The handle for keydb operations. */ +typedef struct keydb_handle *KEYDB_HANDLE; + /* TOFU database meta object. */ struct tofu_dbs_s; typedef struct tofu_dbs_s *tofu_dbs_t; @@ -94,6 +97,8 @@ struct server_control_s int batch_updated_wanted; } tofu; + /* This is used to cache a key data base handle. */ + KEYDB_HANDLE cached_getkey_kdb; }; diff --git a/g10/keydb.h b/g10/keydb.h index 271e68fdf..7f427382d 100644 --- a/g10/keydb.h +++ b/g10/keydb.h @@ -109,9 +109,6 @@ struct pubkey_find_info { }; -typedef struct keydb_handle *KEYDB_HANDLE; - - /* Helper type for preference fucntions. */ union pref_hint { diff --git a/kbx/keybox-search.c b/kbx/keybox-search.c index 56515d16a..0bd4e0182 100644 --- a/kbx/keybox-search.c +++ b/kbx/keybox-search.c @@ -746,8 +746,13 @@ keybox_search_reset (KEYBOX_HANDLE hd) if (hd->fp) { - fclose (hd->fp); - hd->fp = NULL; + if (fseeko (hd->fp, 0, SEEK_SET)) + { + /* Ooops. Seek did not work. Close so that the search will + * open the file again. */ + fclose (hd->fp); + hd->fp = NULL; + } } hd->error = 0; hd->eof = 0; |