diff options
| author | Werner Koch <[email protected]> | 2025-03-05 14:31:50 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2025-03-05 14:32:31 +0000 |
| commit | 73f6c2dd4d3e5b58faf69821726988ae984fad89 (patch) | |
| tree | f4a985d55a988e96c40a8a6eed4ab3e9c41ad12e /kbx | |
| parent | Log the Windows system error code at more places. (diff) | |
| download | gnupg-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 'kbx')
| -rw-r--r-- | kbx/keyboxd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kbx/keyboxd.c b/kbx/keyboxd.c index 197f01c74..28e292e10 100644 --- a/kbx/keyboxd.c +++ b/kbx/keyboxd.c @@ -1448,8 +1448,9 @@ start_connection_thread (void *arg) if (check_nonce (ctrl, &socket_nonce)) { - log_error ("handler 0x%lx nonce check FAILED\n", - (unsigned long) npth_self()); + log_error ("handler 0x%lx for fd %d FAILED nonce check\n", + (unsigned long) npth_self(), FD_DBG (ctrl->thread_startup.fd)); + assuan_sock_close (ctrl->thread_startup.fd); return NULL; } |