PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 04:31:29 +00:00
Code Issues Projects Releases Wiki Activity

Fix ncat -e --ssl on Windows. Fixes #1267, #1274

Browse Source
This commit is contained in:
dmiller
2018-07-23 04:56:56 +00:00
parent 12f7822950
commit f31ef12ca3
2 changed files with 45 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@@ -1,5 +1,8 @@
#Nmap Changelog ($Id$); -*-text-*-
o [Ncat][GH#1267] Fixed communication with commands launched with -e or -c on
Windows, especially when --ssl is used. [Daniel Miller]
o Upgraded included libpcap to 1.8.1 [Daniel Miller]
o [NSE] Script http-default-accounts was not able to run against more than one

56
ncat/ncat_exec_win.c
View File

@@ -484,26 +484,40 @@ static DWORD WINAPI subprocess_thread_func(void *data)
for (;;) {
DWORD n_r, n_w;
int i, n;
i = WaitForMultipleObjects(3, events, FALSE, INFINITE);
if (i == WAIT_OBJECT_0) {
/* Read from socket, write to process. */
char *crlf = NULL, *wbuf;
char buffer[BUFSIZ];
int pending;
i = WaitForMultipleObjects(3, events, FALSE, INFINITE);
switch(i) {
case WAIT_OBJECT_0:
/* Read from socket, write to process. */
/* Reset events on the socket. SSL_read in particular does not
* clear the event. */
ResetEvent(events[0]);
WSAEventSelect(info->fdn.fd, events[0], 0);
block_socket(info->fdn.fd);
do {
n = ncat_recv(&info->fdn, buffer, sizeof(buffer), &pending);
if (n <= 0)
{
goto loop_end;
}
n_r = n;
if (WriteFile(info->child_in_w, buffer, n_r, &n_w, NULL) == 0)
break;
if (n_w != n)
{
goto loop_end;
}
if (n_w != n)
{
goto loop_end;
}
} while (pending);
} else if (i == WAIT_OBJECT_0 + 1) {
char *crlf = NULL, *wbuf;
/* Restore the select event (and non-block the socket again.) */
WSAEventSelect(info->fdn.fd, events[0], FD_READ | FD_CLOSE);
/* Fall through to check other objects */
case WAIT_OBJECT_0 + 1:
/* Read from process, write to socket. */
if (GetOverlappedResult(info->child_out_r, &overlap, &n_r, FALSE)) {
wbuf = pipe_buffer;
@@ -523,28 +537,44 @@ static DWORD WINAPI subprocess_thread_func(void *data)
if (crlf != NULL)
free(crlf);
if (n != n_r)
break;
{
goto loop_end;
}
/* Restore the select event (and non-block the socket again.) */
WSAEventSelect(info->fdn.fd, events[0], FD_READ | FD_CLOSE);
/* Queue another asychronous read. */
ReadFile(info->child_out_r, pipe_buffer, sizeof(pipe_buffer), NULL, &overlap);
} else {
/* Probably read result wasn't ready, but we got here because
* there was data on the socket. */
if (GetLastError() != ERROR_IO_PENDING)
{
/* Error or end of file. */
break;
goto loop_end;
}
} else if (i == WAIT_OBJECT_0 + 2) {
}
/* Break here, don't go on. Need to finish all socket writes before
* checking if child process died. */
break;
case WAIT_OBJECT_0 + 2:
/* The child died. There are no more writes left in the pipe
because WaitForMultipleObjects guarantees events with lower
indexes are handled first. */
break;
} else {
default:
goto loop_end;
break;
}
}
loop_end:
#ifdef HAVE_OPENSSL
if (o.ssl && fdn->ssl) {
SSL_shutdown(fdn->ssl);
SSL_free(fdn->ssl);
}
#endif
WSACloseEvent(events[0]);
rc = unregister_subprocess(info->proc);