Bug fix

Fixed SSL_WSAConnect_* not setting sent state when PostQueuedCompletionStatus is called.
erickutcher · Oct 29, 2018 · 7c769b7 · 7c769b7
1 parent 09fda6e
commit 7c769b7
Show file tree

Hide file tree

Showing 30 changed files with 35 additions and 31 deletions.
diff --git a/HTTP_Proxy/connection.cpp b/HTTP_Proxy/connection.cpp
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by

diff --git a/HTTP_Proxy/connection.h b/HTTP_Proxy/connection.h
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by

diff --git a/HTTP_Proxy/doublylinkedlist.cpp b/HTTP_Proxy/doublylinkedlist.cpp
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by

diff --git a/HTTP_Proxy/doublylinkedlist.h b/HTTP_Proxy/doublylinkedlist.h
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by

diff --git a/HTTP_Proxy/file_operations.cpp b/HTTP_Proxy/file_operations.cpp
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by

diff --git a/HTTP_Proxy/file_operations.h b/HTTP_Proxy/file_operations.h
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by

diff --git a/HTTP_Proxy/globals.h b/HTTP_Proxy/globals.h
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by

diff --git a/HTTP_Proxy/http.cpp b/HTTP_Proxy/http.cpp
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by

diff --git a/HTTP_Proxy/http.h b/HTTP_Proxy/http.h
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by

diff --git a/HTTP_Proxy/lite_advapi32.cpp b/HTTP_Proxy/lite_advapi32.cpp
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by

diff --git a/HTTP_Proxy/lite_advapi32.h b/HTTP_Proxy/lite_advapi32.h
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by

diff --git a/HTTP_Proxy/lite_crypt32.cpp b/HTTP_Proxy/lite_crypt32.cpp
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by

diff --git a/HTTP_Proxy/lite_crypt32.h b/HTTP_Proxy/lite_crypt32.h
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by

diff --git a/HTTP_Proxy/lite_dlls.cpp b/HTTP_Proxy/lite_dlls.cpp
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by

diff --git a/HTTP_Proxy/lite_dlls.h b/HTTP_Proxy/lite_dlls.h
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by

diff --git a/HTTP_Proxy/lite_normaliz.cpp b/HTTP_Proxy/lite_normaliz.cpp
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by

diff --git a/HTTP_Proxy/lite_normaliz.h b/HTTP_Proxy/lite_normaliz.h
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by

diff --git a/HTTP_Proxy/lite_ntdll.cpp b/HTTP_Proxy/lite_ntdll.cpp
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by

diff --git a/HTTP_Proxy/lite_ntdll.h b/HTTP_Proxy/lite_ntdll.h
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by

diff --git a/HTTP_Proxy/lite_rpcrt4.cpp b/HTTP_Proxy/lite_rpcrt4.cpp
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by

diff --git a/HTTP_Proxy/lite_rpcrt4.h b/HTTP_Proxy/lite_rpcrt4.h
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by

diff --git a/HTTP_Proxy/lite_shell32.cpp b/HTTP_Proxy/lite_shell32.cpp
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by

diff --git a/HTTP_Proxy/lite_shell32.h b/HTTP_Proxy/lite_shell32.h
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by

diff --git a/HTTP_Proxy/lite_ws2_32.cpp b/HTTP_Proxy/lite_ws2_32.cpp
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by

diff --git a/HTTP_Proxy/lite_ws2_32.h b/HTTP_Proxy/lite_ws2_32.h
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by

diff --git a/HTTP_Proxy/main.cpp b/HTTP_Proxy/main.cpp
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -1463,7 +1463,7 @@ int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdL
 
 
 	EnterCriticalSection( &console_cs );
-	_wprintf( L"HTTP Proxy/Tunnel is made free under the GPLv3 license.\r\nVersion 1.0.0.1\r\nCopyright (c) 2016-2017 Eric Kutcher\r\n\r\n" );
+	_wprintf( L"HTTP Proxy/Tunnel is made free under the GPLv3 license.\r\nVersion 1.0.0.2\r\nCopyright (c) 2016-2018 Eric Kutcher\r\n\r\n" );
 	LeaveCriticalSection( &console_cs );
 
 

diff --git a/HTTP_Proxy/ssl.cpp b/HTTP_Proxy/ssl.cpp
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -775,6 +775,8 @@ SECURITY_STATUS SSL_WSAConnect_Response( SOCKET_CONTEXT *context, bool &sent )
 			}
 			else
 			{
+				sent = true;
+
 				// Do not post the ssl->cbIoBuffer size.
 				PostQueuedCompletionStatus( g_hIOCP, 0, ( ULONG_PTR )context, &context->overlapped_read );
 			}
@@ -924,6 +926,8 @@ SECURITY_STATUS SSL_WSAConnect_Reply( SOCKET_CONTEXT *context, bool &sent )
 						ssl->acd.OutBuffers[ 0 ].pvBuffer = NULL;
 					}
 
+					sent = true;
+
 					PostQueuedCompletionStatus( g_hIOCP, 0, ( ULONG_PTR )context, &context->overlapped_read );
 
 					return scRet;

diff --git a/HTTP_Proxy/ssl.h b/HTTP_Proxy/ssl.h
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by

diff --git a/HTTP_Proxy/utilities.cpp b/HTTP_Proxy/utilities.cpp
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by

diff --git a/HTTP_Proxy/utilities.h b/HTTP_Proxy/utilities.h
@@ -1,6 +1,6 @@
 /*
 	HTTP Proxy can proxy HTTP and HTTPS connections.
-	Copyright (C) 2016-2017 Eric Kutcher
+	Copyright (C) 2016-2018 Eric Kutcher
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by