From 21945be4c4ef822b7dc5f6ded80027bd5437ce9d Mon Sep 17 00:00:00 2001
From: Vincent Richard <vincent@vincent-richard.net>
Date: Sun, 24 Mar 2013 12:30:26 +0100
Subject: Fixed warnings and 64-bit issues.

---
 src/security/cert/gnutls/X509Certificate_GnuTLS.cpp   | 6 +++---
 src/security/cert/openssl/X509Certificate_OpenSSL.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/security')

diff --git a/src/security/cert/gnutls/X509Certificate_GnuTLS.cpp b/src/security/cert/gnutls/X509Certificate_GnuTLS.cpp
index fd1343dd..96137844 100644
--- a/src/security/cert/gnutls/X509Certificate_GnuTLS.cpp
+++ b/src/security/cert/gnutls/X509Certificate_GnuTLS.cpp
@@ -96,7 +96,7 @@ ref <X509Certificate> X509Certificate::import(utility::inputStream& is)
 
 	while (!is.eof())
 	{
-		const int len = is.read(chunk, sizeof(chunk));
+		const utility::stream::size_type len = is.read(chunk, sizeof(chunk));
 		bytes.insert(bytes.end(), chunk, chunk + len);
 	}
 
@@ -106,11 +106,11 @@ ref <X509Certificate> X509Certificate::import(utility::inputStream& is)
 
 // static
 ref <X509Certificate> X509Certificate::import
-	(const byte_t* data, const unsigned int length)
+	(const byte_t* data, const size_t length)
 {
 	gnutls_datum buffer;
 	buffer.data = const_cast <byte_t*>(data);
-	buffer.size = length;
+	buffer.size = static_cast <unsigned int>(length);
 
 	// Try DER format
 	ref <X509Certificate_GnuTLS> derCert = vmime::create <X509Certificate_GnuTLS>();
diff --git a/src/security/cert/openssl/X509Certificate_OpenSSL.cpp b/src/security/cert/openssl/X509Certificate_OpenSSL.cpp
index ff2062c1..61be0d6d 100755
--- a/src/security/cert/openssl/X509Certificate_OpenSSL.cpp
+++ b/src/security/cert/openssl/X509Certificate_OpenSSL.cpp
@@ -185,7 +185,7 @@ ref <X509Certificate> X509Certificate::import(utility::inputStream& is)
 
 // static
 ref <X509Certificate> X509Certificate::import
-	(const byte_t* data, const unsigned int length)
+	(const byte_t* data, const size_t length)
 {
 	ref <X509Certificate_OpenSSL> cert = vmime::create <X509Certificate_OpenSSL>();
 
-- 
cgit