4 files changed, 18 insertions, 18 deletions

diff --git a/src/security/sasl/SASLContext.cpp b/src/security/sasl/SASLContext.cpp
index cf7d94f6..a4e25feb 100644
--- a/src/security/sasl/SASLContext.cpp
+++ b/src/security/sasl/SASLContext.cpp
@@ -96,7 +96,7 @@ ref <SASLMechanism> SASLContext::suggestMechanism
 }
 
 
-void SASLContext::decodeB64(const string& input, byte** output, int* outputLen)
+void SASLContext::decodeB64(const string& input, byte_t** output, int* outputLen)
 {
 	string res;
 
@@ -107,7 +107,7 @@ void SASLContext::decodeB64(const string& input, byte** output, int* outputLen)
 
 	dec->decode(is, os);
 
-	byte* out = new byte[res.length()];
+	byte_t* out = new byte_t[res.length()];
 
 	std::copy(res.begin(), res.end(), out);
 
@@ -116,7 +116,7 @@ void SASLContext::decodeB64(const string& input, byte** output, int* outputLen)
 }
 
 
-const string SASLContext::encodeB64(const byte* input, const int inputLen)
+const string SASLContext::encodeB64(const byte_t* input, const int inputLen)
 {
 	string res;
 
diff --git a/src/security/sasl/SASLSession.cpp b/src/security/sasl/SASLSession.cpp
index 64606d01..9e66baa0 100644
--- a/src/security/sasl/SASLSession.cpp
+++ b/src/security/sasl/SASLSession.cpp
@@ -93,8 +93,8 @@ ref <SASLContext> SASLSession::getContext()
 
 
 const bool SASLSession::evaluateChallenge
-	(const byte* challenge, const int challengeLen,
-	 byte** response, int* responseLen)
+	(const byte_t* challenge, const int challengeLen,
+	 byte_t** response, int* 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 1d2caff1..b4d1794f 100644
--- a/src/security/sasl/SASLSocket.cpp
+++ b/src/security/sasl/SASLSocket.cpp
@@ -105,11 +105,11 @@ const int SASLSocket::receiveRaw(char* buffer, const int count)
 
 	const int n = m_wrapped->receiveRaw(buffer, count);
 
-	byte* output = 0;
+	byte_t* output = 0;
 	int outputLen = 0;
 
 	m_session->getMechanism()->decode
-		(m_session, reinterpret_cast <const byte*>(buffer), n,
+		(m_session, reinterpret_cast <const byte_t*>(buffer), n,
 		 &output, &outputLen);
 
 	// If we can not copy all decoded data into the output buffer, put
@@ -143,11 +143,11 @@ void SASLSocket::send(const string& buffer)
 
 void SASLSocket::sendRaw(const char* buffer, const int count)
 {
-	byte* output = 0;
+	byte_t* output = 0;
 	int outputLen = 0;
 
 	m_session->getMechanism()->encode
-		(m_session, reinterpret_cast <const byte*>(buffer), count,
+		(m_session, reinterpret_cast <const byte_t*>(buffer), count,
 		 &output, &outputLen);
 
 	try
diff --git a/src/security/sasl/builtinSASLMechanism.cpp b/src/security/sasl/builtinSASLMechanism.cpp
index 45eddfd5..84819742 100644
--- a/src/security/sasl/builtinSASLMechanism.cpp
+++ b/src/security/sasl/builtinSASLMechanism.cpp
@@ -57,8 +57,8 @@ const string builtinSASLMechanism::getName() const
 
 
 const bool builtinSASLMechanism::step
-	(ref <SASLSession> sess, const byte* challenge, const int challengeLen,
-	 byte** response, int* responseLen)
+	(ref <SASLSession> sess, const byte_t* challenge, const int challengeLen,
+	 byte_t** response, int* responseLen)
 {
 	char* output = 0;
 	size_t outputLen = 0;
@@ -69,7 +69,7 @@ const bool builtinSASLMechanism::step
 
 	if (result == GSASL_OK || result == GSASL_NEEDS_MORE)
 	{
-		byte* res = new byte[outputLen];
+		byte_t* res = new byte_t[outputLen];
 
 		for (size_t i = 0 ; i < outputLen ; ++i)
 			res[i] = output[i];
@@ -115,8 +115,8 @@ const bool builtinSASLMechanism::isComplete() const
 
 
 void builtinSASLMechanism::encode
-	(ref <SASLSession> sess, const byte* input, const int inputLen,
-	 byte** output, int* outputLen)
+	(ref <SASLSession> sess, const byte_t* input, const int inputLen,
+	 byte_t** output, int* outputLen)
 {
 	char* coutput = 0;
 	size_t coutputLen = 0;
@@ -130,7 +130,7 @@ void builtinSASLMechanism::encode
 
 	try
 	{
-		byte* res = new byte[coutputLen];
+		byte_t* res = new byte_t[coutputLen];
 
 		std::copy(coutput, coutput + coutputLen, res);
 
@@ -148,8 +148,8 @@ void builtinSASLMechanism::encode
 
 
 void builtinSASLMechanism::decode
-	(ref <SASLSession> sess, const byte* input, const int inputLen,
-	 byte** output, int* outputLen)
+	(ref <SASLSession> sess, const byte_t* input, const int inputLen,
+	 byte_t** output, int* outputLen)
 {
 	char* coutput = 0;
 	size_t coutputLen = 0;
@@ -163,7 +163,7 @@ void builtinSASLMechanism::decode
 			throw exceptions::sasl_exception("Decoding error.");
 		}
 
-		byte* res = new byte[coutputLen];
+		byte_t* res = new byte_t[coutputLen];
 
 		std::copy(coutput, coutput + coutputLen, res);