Fixes #296. Removes polarssl references

git-svn-id: file:///home/svn/framework3/trunk@6811 4d416f70-5f16-0410-b530-b9f4589650da

external/source/meterpreter/source/client/metcli.c

@@ -3,6 +3,11 @@
 extern VOID remote_register_core_dispatch_routines();
 extern VOID remote_deregister_core_dispatch_routines();
 
+// include the OpenSSL library
+#pragma comment(lib,"libeay32.lib")
+#pragma comment(lib,"ssleay32.lib")
+
+
 HANDLE clientLock = NULL;
 
 /*
@@ -19,6 +24,9 @@ int main(int argc, char **argv)
 
 	WSAStartup(0x0202, &data);
 
+	printf("ERROR: This client is out of date and does not support SSL\n");
+	exit(0);
+
 	if (argc < 3)
 	{
 		printf("Usage: %s <host> <port>\n", argv[0]);

external/source/meterpreter/source/common/common.h

@@ -10,9 +10,7 @@
 	#include <windows.h>
 #endif
 
-#include "polarssl/net.h"
-#include "polarssl/ssl.h"
-#include "polarssl/havege.h"
+#include <openssl/ssl.h>
 
 #include "linkage.h"
 

external/source/meterpreter/source/common/core.c

@@ -1,8 +1,5 @@
 #include "common.h"
 
-// include the PolarSSL library
-#pragma comment(lib,"polarssl.lib")
-
 DWORD packet_find_tlv_buf(PUCHAR payload, DWORD payloadLength, DWORD index,
 		TlvType type, Tlv *tlv);
 
@@ -708,13 +705,13 @@ DWORD packet_transmit(Remote *remote, Packet *packet,
 		idx = 0;
 		while( idx < sizeof(packet->header)) { 
 			// Transmit the packet's header (length, type)
-			while( (res = ssl_write(
-						&remote->ssl, 
-						(LPCSTR)(&packet->header) + idx, 
-						sizeof(packet->header) - idx)) == POLARSSL_ERR_NET_TRY_AGAIN) { 
-				dprintf("resending SSL header data on blocked socket");
-			}
-			if(res < 0) {
+			res = SSL_write(
+				remote->ssl, 
+				(LPCSTR)(&packet->header) + idx, 
+				sizeof(packet->header) - idx
+			);
+				
+			if(res <= 0) {
 				dprintf("transmit header failed with return %d at index %d\n", res, idx);
 				break;
 			}
@@ -725,13 +722,14 @@ DWORD packet_transmit(Remote *remote, Packet *packet,
 		idx = 0;
 		while( idx < packet->payloadLength) { 
 			// Transmit the packet's payload (length, type)
-			while( (res = ssl_write(
-						&remote->ssl, 
-						packet->payload + idx,
-						packet->payloadLength - idx)) == POLARSSL_ERR_NET_TRY_AGAIN) { 
-				dprintf("resending SSL payload data on blocked socket");
-			}
-			
+			res = SSL_write(
+				remote->ssl, 
+				packet->payload + idx,
+				packet->payloadLength - idx
+			);
+			if(res < 0)
+				break;
+
 			idx += res;
 		}
 		if(res < 0) {
@@ -786,12 +784,10 @@ DWORD packet_receive(Remote *remote, Packet **packet)
 		// Read the packet length
 		while (inHeader)
 		{
-			if ((bytesRead = ssl_read(&remote->ssl, 
+			if ((bytesRead = SSL_read(remote->ssl, 
 					((PUCHAR)&header + headerBytes), 
 					sizeof(TlvHeader) - headerBytes)) <= 0)
 			{
-				if(bytesRead == POLARSSL_ERR_NET_TRY_AGAIN) continue;
-				
 				if (!bytesRead)
 					SetLastError(ERROR_NOT_FOUND);
 
@@ -830,11 +826,10 @@ DWORD packet_receive(Remote *remote, Packet **packet)
 		// Read the payload
 		while (payloadBytesLeft > 0)
 		{
-			if ((bytesRead = ssl_read(&remote->ssl, 
+			if ((bytesRead = SSL_read(remote->ssl, 
 					payload + payloadLength - payloadBytesLeft, 
 					payloadBytesLeft)) <= 0)
 			{
-				if(bytesRead == POLARSSL_ERR_NET_TRY_AGAIN) continue;
 
 				if (GetLastError() == WSAEWOULDBLOCK)
 					continue;

external/source/meterpreter/source/extensions/sniffer/sniffer.c

@@ -170,7 +170,7 @@ void __stdcall sniffer_receive(DWORD_PTR Param, DWORD_PTR ThParam, HANDLE hPacke
 	ETHERNET_HEADER *eth;
 	IP_HEADER *ip;
 	TCP_HEADER *tcp;
-	UDP_HEADER *udp;
+//	UDP_HEADER *udp;
 
 
 	j = (CaptureJob *)Param;
@@ -309,7 +309,6 @@ DWORD request_sniffer_capture_start(Remote *remote, Packet *packet) {
 		j->max_pkts = maxp;
 		j->cur_pkts = 0;
 		j->mtu      = AdpCfgGetMaxPacketSize(AdpGetConfig(j->adp));
-		j->remote   = remote;
 
 		AdpSetOnPacketRecv(j->adp, (FARPROC) sniffer_receive, (DWORD_PTR)j);
 		AdpSetMacFilter(j->adp, mfAll);

external/source/meterpreter/source/server/metsrv.c

@@ -136,9 +136,11 @@ DWORD negotiate_ssl(Remote *remote)
 	SSL_library_init();
 
 	remote->meth = TLSv1_client_method();
-	remote->ctx  = SSL_CTX_new(remote->meth);
-	remote->ssl  = SSL_new(remote->ctx);
 
+	remote->ctx  = SSL_CTX_new(remote->meth);
+	SSL_CTX_set_mode(remote->ctx, SSL_MODE_AUTO_RETRY);
+
+	remote->ssl  = SSL_new(remote->ctx);
 	SSL_set_verify(remote->ssl, SSL_VERIFY_NONE, NULL);
 	SSL_set_fd(remote->ssl, remote->fd);