mirror of
git://git.gnupg.org/gnupg.git
synced 2025-04-12 22:11:29 +02:00
gpg: Disable keydb handle caching
* g10/getkey.c (getkey_end): Disable caching of the open keydb handle. -- This created a big regression for Windows because the keyring is only released after the global ctrl is released. So if an operation does a getkey and then tries to modify the keyring it will fail on Windows with a sharing violation. We need to modify all keyring write operations to also take the ctrl and close the cached_getkey_kdb handle to make writing work. See: https://dev.gnupg.org/T3097 GnuPG-Bug-Id: T3097 Signed-off-by: Andre Heinecke <aheinecke@intevation.de>
This commit is contained in:
parent
996544626e
commit
d3d640b9cc
12
g10/getkey.c
12
g10/getkey.c
@ -2219,10 +2219,20 @@ getkey_end (ctrl_t ctrl, getkey_ctx_t ctx)
|
|||||||
{
|
{
|
||||||
if (ctx)
|
if (ctx)
|
||||||
{
|
{
|
||||||
|
/*
|
||||||
|
XXX: This creates a big regression for Windows because the keyring
|
||||||
|
* is only released after the global ctrl is released. So if an operation
|
||||||
|
* does a getkey and then tries to modify the keyring it will fail on
|
||||||
|
* Windows with a sharing violation. We need to modify all
|
||||||
|
* keyring write operations to also take the ctrl and close the
|
||||||
|
* cached_getkey_kdb handle to make writing work. See:
|
||||||
|
* https://dev.gnupg.org/T3097
|
||||||
|
|
||||||
if (ctrl && !ctrl->cached_getkey_kdb)
|
if (ctrl && !ctrl->cached_getkey_kdb)
|
||||||
ctrl->cached_getkey_kdb = ctx->kr_handle;
|
ctrl->cached_getkey_kdb = ctx->kr_handle;
|
||||||
else
|
else
|
||||||
keydb_release (ctx->kr_handle);
|
*/
|
||||||
|
keydb_release (ctx->kr_handle);
|
||||||
free_strlist (ctx->extra_list);
|
free_strlist (ctx->extra_list);
|
||||||
if (!ctx->not_allocated)
|
if (!ctx->not_allocated)
|
||||||
xfree (ctx);
|
xfree (ctx);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user