6 files changed, 26 insertions, 26 deletions
diff --git a/vmime/security/sasl/SASLContext.hpp b/vmime/security/sasl/SASLContext.hpp
index acdb8b5a..5c8df51f 100644
--- a/vmime/security/sasl/SASLContext.hpp
+++ b/vmime/security/sasl/SASLContext.hpp
@@ -93,7 +93,7 @@ public:
 	  * @param output output buffer
 	  * @param outputLen length of output buffer
 	  */
-	void decodeB64(const string& input, byte_t** output, int* outputLen);
+	void decodeB64(const string& input, byte_t** output, long* outputLen);
 
 	/** Helper function for encoding challenge in Base64.
 	  *
@@ -101,7 +101,7 @@ public:
 	  * @param inputLen length of input buffer
 	  * @return Base64-encoded challenge
 	  */
-	const string encodeB64(const byte_t* input, const int inputLen);
+	const string encodeB64(const byte_t* input, const long inputLen);
 
 private:
 
diff --git a/vmime/security/sasl/SASLMechanism.hpp b/vmime/security/sasl/SASLMechanism.hpp
index 678a3030..1411418a 100644
--- a/vmime/security/sasl/SASLMechanism.hpp
+++ b/vmime/security/sasl/SASLMechanism.hpp
@@ -72,8 +72,8 @@ public:
 	  */
 	virtual bool step
 		(ref <SASLSession> sess,
-		 const byte_t* challenge, const int challengeLen,
-		 byte_t** response, int* responseLen) = 0;
+		 const byte_t* challenge, const long challengeLen,
+		 byte_t** response, long* responseLen) = 0;
 
 	/** Check whether authentication has completed. If false, more
 	  * calls to evaluateChallenge() are needed to complete the
@@ -98,8 +98,8 @@ public:
 	  * 'outputLen' are undetermined)
 	  */
 	virtual void encode(ref <SASLSession> sess,
-		const byte_t* input, const int inputLen,
-		byte_t** output, int* outputLen) = 0;
+		const byte_t* input, const long inputLen,
+		byte_t** output, long* outputLen) = 0;
 
 	/** Decode data according to negotiated SASL mechanism. This
 	  * might mean that data is integrity or privacy protected.
@@ -115,8 +115,8 @@ public:
 	  * 'outputLen' are undetermined)
 	  */
 	virtual void decode(ref <SASLSession> sess,
-		const byte_t* input, const int inputLen,
-		byte_t** output, int* outputLen) = 0;
+		const byte_t* input, const long inputLen,
+		byte_t** output, long* outputLen) = 0;
 };
 
 
diff --git a/vmime/security/sasl/SASLSession.hpp b/vmime/security/sasl/SASLSession.hpp
index 63645b18..cfe67d94 100644
--- a/vmime/security/sasl/SASLSession.hpp
+++ b/vmime/security/sasl/SASLSession.hpp
@@ -108,8 +108,8 @@ public:
 	  * 'responseLen' are undetermined)
 	  */
 	bool 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 a socket in which transmitted data is integrity
 	  * and/or privacy protected, depending on the QOP (Quality of
diff --git a/vmime/security/sasl/SASLSocket.hpp b/vmime/security/sasl/SASLSocket.hpp
index d6f4ecd9..0e7d209f 100644
--- a/vmime/security/sasl/SASLSocket.hpp
+++ b/vmime/security/sasl/SASLSocket.hpp
@@ -75,8 +75,8 @@ private:
 	ref <net::socket> m_wrapped;
 
 	byte_t* m_pendingBuffer;
-	int m_pendingPos;
-	int m_pendingLen;
+	size_type m_pendingPos;
+	size_type m_pendingLen;
 
 	char m_recvBuffer[65536];
 };
diff --git a/vmime/security/sasl/builtinSASLMechanism.hpp b/vmime/security/sasl/builtinSASLMechanism.hpp
index aa6c360c..c88f35b3 100644
--- a/vmime/security/sasl/builtinSASLMechanism.hpp
+++ b/vmime/security/sasl/builtinSASLMechanism.hpp
@@ -56,18 +56,18 @@ public:
 	const string getName() const;
 
 	bool step(ref <SASLSession> sess,
-		 const byte_t* challenge, const int challengeLen,
-		 byte_t** response, int* responseLen);
+		 const byte_t* challenge, const long challengeLen,
+		 byte_t** response, long* responseLen);
 
 	bool isComplete() const;
 
 	void encode(ref <SASLSession> sess,
-		const byte_t* input, const int inputLen,
-		byte_t** output, int* outputLen);
+		const byte_t* input, const long inputLen,
+		byte_t** output, long* outputLen);
 
 	void decode(ref <SASLSession> sess,
-		const byte_t* input, const int inputLen,
-		byte_t** output, int* outputLen);
+		const byte_t* input, const long inputLen,
+		byte_t** output, long* outputLen);
 
 private:
 
diff --git a/vmime/utility/progressListener.hpp b/vmime/utility/progressListener.hpp
index 39b884ab..fdc86660 100644
--- a/vmime/utility/progressListener.hpp
+++ b/vmime/utility/progressListener.hpp
@@ -55,20 +55,20 @@ public:
 	  * @param predictedTotal predicted amount of units (this has
 	  * no concrete meaning: these are not bytes, nor percentage...)
 	  */
-	virtual void start(const int predictedTotal) = 0;
+	virtual void start(const long predictedTotal) = 0;
 
 	/** Called during the operation (can be called several times).
 	  *
 	  * @param current current position
 	  * @param currentTotal adjusted total amount of units
 	  */
-	virtual void progress(const int current, const int currentTotal) = 0;
+	virtual void progress(const long current, const long currentTotal) = 0;
 
 	/** Called at the end of the operation.
 	  *
 	  * @param total final total amount of units
 	  */
-	virtual void stop(const int total) = 0;
+	virtual void stop(const long total) = 0;
 };
 
 
@@ -86,18 +86,18 @@ public:
 	  * @param list wrapped progress listener (can be NULL)
 	  * @param total predicted total
 	  */
-	progressListenerSizeAdapter(progressListener* list, const int total);
+	progressListenerSizeAdapter(progressListener* list, const long total);
 
 	bool cancel() const;
 
-	void start(const int predictedTotal);
-	void progress(const int current, const int currentTotal);
-	void stop(const int total);
+	void start(const long predictedTotal);
+	void progress(const long current, const long currentTotal);
+	void stop(const long total);
 
 private:
 
 	progressListener* m_wrapped;
-	int m_total;
+	long m_total;
 };