aboutsummaryrefslogtreecommitdiffstats
path: root/dirmngr/dirmngr.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2025-03-05 14:31:50 +0000
committerWerner Koch <[email protected]>2025-03-05 14:32:31 +0000
commit73f6c2dd4d3e5b58faf69821726988ae984fad89 (patch)
treef4a985d55a988e96c40a8a6eed4ab3e9c41ad12e /dirmngr/dirmngr.c
parentLog the Windows system error code at more places. (diff)
downloadgnupg-73f6c2dd4d3e5b58faf69821726988ae984fad89.tar.gz
gnupg-73f6c2dd4d3e5b58faf69821726988ae984fad89.zip
w32: On socket nonce mismatch close the socket.
* agent/gpg-agent.c (start_connection_thread_std): Close socket on nonce mismatch. (start_connection_thread_extra): Ditto. (start_connection_thread_browser): Ditto. (start_connection_thread_ssh): Ditto. * dirmngr/dirmngr.c (start_connection_thread): Ditto. * kbx/keyboxd.c (start_connection_thread): Ditto. -- Usually Libassuan takes care of closing the socket but because we do the nonce check before setting up Assuan we need to explicit close it. GnuPG-bug-id: 7434
Diffstat (limited to 'dirmngr/dirmngr.c')
-rw-r--r--dirmngr/dirmngr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index cdad4f921..e99220fff 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -2259,7 +2259,8 @@ start_connection_thread (void *arg)
if (check_nonce (fd, &socket_nonce))
{
- log_error ("handler nonce check FAILED\n");
+ log_error ("handler for fd %d FAILED nonce check\n", FD_DBG (fd));
+ assuan_sock_close (fd);
return NULL;
}