4 files changed, 16 insertions, 16 deletions
diff --git a/src/security/sasl/SASLContext.cpp b/src/security/sasl/SASLContext.cpp
index 8c623124..bf601b35 100644
--- a/src/security/sasl/SASLContext.cpp
+++ b/src/security/sasl/SASLContext.cpp
@@ -106,7 +106,7 @@ ref <SASLMechanism> SASLContext::suggestMechanism
 }
 
 
-void SASLContext::decodeB64(const string& input, byte_t** output, int* outputLen)
+void SASLContext::decodeB64(const string& input, byte_t** output, long* outputLen)
 {
 	string res;
 
@@ -127,7 +127,7 @@ void SASLContext::decodeB64(const string& input, byte_t** output, int* outputLen
 }
 
 
-const string SASLContext::encodeB64(const byte_t* input, const int inputLen)
+const string SASLContext::encodeB64(const byte_t* input, const long inputLen)
 {
 	string res;
 
diff --git a/src/security/sasl/SASLSession.cpp b/src/security/sasl/SASLSession.cpp
index dcf53452..1ab6d577 100644
--- a/src/security/sasl/SASLSession.cpp
+++ b/src/security/sasl/SASLSession.cpp
@@ -99,8 +99,8 @@ ref <SASLContext> SASLSession::getContext()
 
 
 bool SASLSession::evaluateChallenge
-	(const byte_t* challenge, const int challengeLen,
-	 byte_t** response, int* responseLen)
+	(const byte_t* challenge, const long challengeLen,
+	 byte_t** response, long* responseLen)
 {
 	return m_mech->step(thisRef().dynamicCast <SASLSession>(),
 		challenge, challengeLen, response, responseLen);
diff --git a/src/security/sasl/SASLSocket.cpp b/src/security/sasl/SASLSocket.cpp
index 531e4188..c3498d22 100644
--- a/src/security/sasl/SASLSocket.cpp
+++ b/src/security/sasl/SASLSocket.cpp
@@ -83,7 +83,7 @@ SASLSocket::size_type SASLSocket::getBlockSize() const
 
 void SASLSocket::receive(string& buffer)
 {
-	const int n = receiveRaw(m_recvBuffer, sizeof(m_recvBuffer));
+	const size_type n = receiveRaw(m_recvBuffer, sizeof(m_recvBuffer));
 
 	buffer = string(m_recvBuffer, n);
 }
@@ -93,7 +93,7 @@ SASLSocket::size_type SASLSocket::receiveRaw(char* buffer, const size_type count
 {
 	if (m_pendingLen != 0)
 	{
-		const int copyLen =
+		const size_type copyLen =
 			(count >= m_pendingLen ? m_pendingLen : count);
 
 		std::copy(m_pendingBuffer + m_pendingPos,
@@ -115,10 +115,10 @@ SASLSocket::size_type SASLSocket::receiveRaw(char* buffer, const size_type count
 		return copyLen;
 	}
 
-	const int n = m_wrapped->receiveRaw(buffer, count);
+	const size_type n = m_wrapped->receiveRaw(buffer, count);
 
 	byte_t* output = 0;
-	int outputLen = 0;
+	long outputLen = 0;
 
 	m_session->getMechanism()->decode
 		(m_session, reinterpret_cast <const byte_t*>(buffer), n,
@@ -156,7 +156,7 @@ void SASLSocket::send(const string& buffer)
 void SASLSocket::sendRaw(const char* buffer, const size_type count)
 {
 	byte_t* output = 0;
-	int outputLen = 0;
+	long outputLen = 0;
 
 	m_session->getMechanism()->encode
 		(m_session, reinterpret_cast <const byte_t*>(buffer), count,
@@ -180,7 +180,7 @@ void SASLSocket::sendRaw(const char* buffer, const size_type count)
 SASLSocket::size_type SASLSocket::sendRawNonBlocking(const char* buffer, const size_type count)
 {
 	byte_t* output = 0;
-	int outputLen = 0;
+	long outputLen = 0;
 
 	m_session->getMechanism()->encode
 		(m_session, reinterpret_cast <const byte_t*>(buffer), count,
diff --git a/src/security/sasl/builtinSASLMechanism.cpp b/src/security/sasl/builtinSASLMechanism.cpp
index 9501fb4b..618f4a3b 100644
--- a/src/security/sasl/builtinSASLMechanism.cpp
+++ b/src/security/sasl/builtinSASLMechanism.cpp
@@ -63,8 +63,8 @@ const string builtinSASLMechanism::getName() const
 
 
 bool builtinSASLMechanism::step
-	(ref <SASLSession> sess, const byte_t* challenge, const int challengeLen,
-	 byte_t** response, int* responseLen)
+	(ref <SASLSession> sess, const byte_t* challenge, const long challengeLen,
+	 byte_t** response, long* responseLen)
 {
 	char* output = 0;
 	size_t outputLen = 0;
@@ -121,8 +121,8 @@ bool builtinSASLMechanism::isComplete() const
 
 
 void builtinSASLMechanism::encode
-	(ref <SASLSession> sess, const byte_t* input, const int inputLen,
-	 byte_t** output, int* outputLen)
+	(ref <SASLSession> sess, const byte_t* input, const long inputLen,
+	 byte_t** output, long* outputLen)
 {
 	char* coutput = 0;
 	size_t coutputLen = 0;
@@ -154,8 +154,8 @@ void builtinSASLMechanism::encode
 
 
 void builtinSASLMechanism::decode
-	(ref <SASLSession> sess, const byte_t* input, const int inputLen,
-	 byte_t** output, int* outputLen)
+	(ref <SASLSession> sess, const byte_t* input, const long inputLen,
+	 byte_t** output, long* outputLen)
 {
 	char* coutput = 0;
 	size_t coutputLen = 0;