1 files changed, 6 insertions, 8 deletions

diff --git a/Tools/ProtoProxy/Connection.h b/Tools/ProtoProxy/Connection.h
index abb8b6cd0..9e04994b7 100644
--- a/Tools/ProtoProxy/Connection.h
+++ b/Tools/ProtoProxy/Connection.h
@@ -62,14 +62,12 @@ public:
 	void LogFlush(void);
 	
 protected:
-	typedef CFB_Mode<AES>::Encryption Encryptor;
-	typedef CFB_Mode<AES>::Decryption Decryptor;
-	
+
 	cByteBuffer m_ClientBuffer;
 	cByteBuffer m_ServerBuffer;
 	
-	Decryptor m_ServerDecryptor;
-	Encryptor m_ServerEncryptor;
+	cAESCFBDecryptor m_ServerDecryptor;
+	cAESCFBEncryptor m_ServerEncryptor;
 
 	AString m_ServerEncryptionBuffer;  // Buffer for the data to be sent to the server once encryption is established
 	
@@ -105,16 +103,16 @@ protected:
 	double GetRelativeTime(void);
 	
 	/// Sends data to the specified socket. If sending fails, prints a fail message using a_Peer and returns false.
-	bool SendData(SOCKET a_Socket, const char * a_Data, int a_Size, const char * a_Peer);
+	bool SendData(SOCKET a_Socket, const char * a_Data, size_t a_Size, const char * a_Peer);
 	
 	/// Sends data to the specified socket. If sending fails, prints a fail message using a_Peer and returns false.
 	bool SendData(SOCKET a_Socket, cByteBuffer & a_Data, const char * a_Peer);
 	
 	/// Sends data to the specfied socket, after encrypting it using a_Encryptor. If sending fails, prints a fail message using a_Peer and returns false
-	bool SendEncryptedData(SOCKET a_Socket, Encryptor & a_Encryptor, const char * a_Data, int a_Size, const char * a_Peer);
+	bool SendEncryptedData(SOCKET a_Socket, cAESCFBEncryptor & a_Encryptor, const char * a_Data, size_t a_Size, const char * a_Peer);
 	
 	/// Sends data to the specfied socket, after encrypting it using a_Encryptor. If sending fails, prints a fail message using a_Peer and returns false
-	bool SendEncryptedData(SOCKET a_Socket, Encryptor & a_Encryptor, cByteBuffer & a_Data, const char * a_Peer);
+	bool SendEncryptedData(SOCKET a_Socket, cAESCFBEncryptor & a_Encryptor, cByteBuffer & a_Data, const char * a_Peer);
 	
 	/// Decodes packets coming from the client, sends appropriate counterparts to the server; returns false if the connection is to be dropped
 	bool DecodeClientsPackets(const char * a_Data, int a_Size);