tyler.durden/Win32-OpenSSH
1
0
Fork 0
mirror of https://github.com/PowerShell/Win32-OpenSSH.git synced 2025-07-21 13:04:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

4-13 C2

Browse Source
This commit is contained in:
manojampalam 2016-04-13 21:48:30 -07:00
parent 491769a99f
commit 4ae341b1e3
2 changed files with 21 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/win32/win32compat/ssh-agent/agent.c
View File

@ -56,7 +56,7 @@ void agent_sm_process_action_queue() {
break; break;
} }
else if (action_queue & ACTION_LISTEN) { else if (action_queue & ACTION_LISTEN) {
HANDLE h, temp; HANDLE h;
long prev_queue; long prev_queue;
struct agent_connection* con = struct agent_connection* con =
(struct agent_connection*)malloc(sizeof(struct agent_connection)); (struct agent_connection*)malloc(sizeof(struct agent_connection));
@ -64,8 +64,8 @@ void agent_sm_process_action_queue() {
h = CreateNamedPipe( h = CreateNamedPipe(
AGENT_PIPE_ID, // pipe name AGENT_PIPE_ID, // pipe name
PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, // read/write access PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, // read/write access
PIPE_TYPE_MESSAGE | // message type pipe PIPE_TYPE_BYTE | // message type pipe
PIPE_READMODE_MESSAGE | // message-read mode PIPE_READMODE_BYTE | // message-read mode
PIPE_WAIT, // blocking mode PIPE_WAIT, // blocking mode
PIPE_UNLIMITED_INSTANCES, // max. instances PIPE_UNLIMITED_INSTANCES, // max. instances
BUFSIZE, // output buffer size BUFSIZE, // output buffer size
@ -78,7 +78,8 @@ void agent_sm_process_action_queue() {
con->next = list; con->next = list;
list = con; list = con;
prev_queue = InterlockedAnd(&action_queue, ~ACTION_LISTEN); prev_queue = InterlockedAnd(&action_queue, ~ACTION_LISTEN);
temp = CreateIoCompletionPort(h, ioc_port, (ULONG_PTR)con, 0); CreateIoCompletionPort(h, ioc_port, (ULONG_PTR)con, 0);
ConnectNamedPipe(h, &con->ol);
if (prev_queue == ACTION_LISTEN) if (prev_queue == ACTION_LISTEN)
break; break;
} }

49
contrib/win32/win32compat/ssh-agent/connection.c
View File

@ -42,21 +42,17 @@ void agent_connection_on_io(struct agent_connection* con, DWORD bytes, OVERLAPPE
if (con->state == DONE) if (con->state == DONE)
DebugBreak(); DebugBreak();
while (1) { //while (1)
{
switch (con->state) { switch (con->state) {
case LISTENING:
agent_listen();
case WRITING: case WRITING:
/* Writing is done, read next request */ /* Writing is done, read next request */
case LISTENING:
con->state = READING_HEADER; con->state = READING_HEADER;
if (con->state == LISTENING)
agent_listen();
ZeroMemory(&con->request, sizeof(con->request)); ZeroMemory(&con->request, sizeof(con->request));
if (ReadFile(con->connection, con->request.buf, if (!ReadFile(con->connection, con->request.buf,
HEADER_SIZE, NULL, &con->ol)) { HEADER_SIZE, NULL, &con->ol) && (GetLastError() != ERROR_IO_PENDING)) {
bytes = HEADER_SIZE;
continue;
}
if (GetLastError() != ERROR_IO_PENDING) {
con->state = DONE; con->state = DONE;
agent_cleanup_connection(con); agent_cleanup_connection(con);
return; return;
@ -66,25 +62,18 @@ void agent_connection_on_io(struct agent_connection* con, DWORD bytes, OVERLAPPE
con->request.read += bytes; con->request.read += bytes;
if (con->request.read == HEADER_SIZE) { if (con->request.read == HEADER_SIZE) {
con->request.size = *((DWORD*)con->request.buf); con->request.size = *((DWORD*)con->request.buf);
con->request.read = 0;
con->state = READING; con->state = READING;
if (ReadFile(con->connection, con->request.buf, if (!ReadFile(con->connection, con->request.buf,
con->request.size, NULL, &con->ol)) { con->request.size, NULL, &con->ol)&&(GetLastError() != ERROR_IO_PENDING)) {
bytes = con->request.size;
continue;
}
if (GetLastError() != ERROR_IO_PENDING) {
con->state = DONE; con->state = DONE;
agent_cleanup_connection(con); agent_cleanup_connection(con);
return; return;
} }
} }
else { else {
if (ReadFile(con->connection, con->request.buf + con->request.read, if (!ReadFile(con->connection, con->request.buf + con->request.read,
HEADER_SIZE - con->request.read, NULL, &con->ol)) { HEADER_SIZE - con->request.read, NULL, &con->ol)&& (GetLastError() != ERROR_IO_PENDING)) {
bytes = HEADER_SIZE - con->request.read;
continue;
}
if (GetLastError() != ERROR_IO_PENDING) {
con->state = DONE; con->state = DONE;
agent_cleanup_connection(con); agent_cleanup_connection(con);
return; return;
@ -96,24 +85,16 @@ void agent_connection_on_io(struct agent_connection* con, DWORD bytes, OVERLAPPE
if (con->request.read == con->request.size) { if (con->request.read == con->request.size) {
/* process request and get response */ /* process request and get response */
con->state = WRITING; con->state = WRITING;
if (WriteFile(con->connection, con->request.buf, if (!WriteFile(con->connection, con->request.buf,
con->request.size, NULL, &con->ol)) { con->request.size, NULL, &con->ol)&& (GetLastError() != ERROR_IO_PENDING) ){
bytes = con->request.size;
continue;
}
if (GetLastError() != ERROR_IO_PENDING) {
con->state = DONE; con->state = DONE;
agent_cleanup_connection(con); agent_cleanup_connection(con);
return; return;
} }
} }
else { else {
if (ReadFile(con->connection, con->request.buf + con->request.read, if (!ReadFile(con->connection, con->request.buf + con->request.read,
con->request.size - con->request.read, NULL, &con->ol)) { con->request.size - con->request.read, NULL, &con->ol)&& (GetLastError() != ERROR_IO_PENDING)) {
bytes = con->request.size - con->request.read;
continue;
}
if (GetLastError() != ERROR_IO_PENDING) {
con->state = DONE; con->state = DONE;
agent_cleanup_connection(con); agent_cleanup_connection(con);
return; return;