3 files changed, 19 insertions, 20 deletions

diff --git a/src/security/digest/md5/md5MessageDigest.cpp b/src/security/digest/md5/md5MessageDigest.cpp
index 852812f9..200af52e 100644
--- a/src/security/digest/md5/md5MessageDigest.cpp
+++ b/src/security/digest/md5/md5MessageDigest.cpp
@@ -117,7 +117,7 @@ static inline void swapUint32Array(vmime_uint32* buf, unsigned long words)
 }
 
 
-void md5MessageDigest::update(const byte b)
+void md5MessageDigest::update(const byte_t b)
 {
 	update(&b, 1);
 }
@@ -125,18 +125,18 @@ void md5MessageDigest::update(const byte b)
 
 void md5MessageDigest::update(const string& s)
 {
-	update(reinterpret_cast <const byte*>(s.data()), s.length());
+	update(reinterpret_cast <const byte_t*>(s.data()), s.length());
 }
 
 
-void md5MessageDigest::update(const byte* data, const unsigned long offset,
+void md5MessageDigest::update(const byte_t* data, const unsigned long offset,
 	const unsigned long len)
 {
 	update(data + offset, len);
 }
 
 
-void md5MessageDigest::update(const byte* data, const unsigned long length)
+void md5MessageDigest::update(const byte_t* data, const unsigned long length)
 {
 	const unsigned long avail = 64 - (m_byteCount & 0x3f);
 	unsigned long len = length;
@@ -175,14 +175,14 @@ void md5MessageDigest::finalize(const string& s)
 }
 
 
-void md5MessageDigest::finalize(const byte* buffer, const unsigned long len)
+void md5MessageDigest::finalize(const byte_t* buffer, const unsigned long len)
 {
 	update(buffer, len);
 	finalize();
 }
 
 
-void md5MessageDigest::finalize(const byte* buffer,
+void md5MessageDigest::finalize(const byte_t* buffer,
 	const unsigned long offset, const unsigned long len)
 {
 	update(buffer, offset, len);
@@ -333,9 +333,9 @@ const int md5MessageDigest::getDigestLength() const
 }
 
 
-const byte* md5MessageDigest::getDigest() const
+const byte_t* md5MessageDigest::getDigest() const
 {
-	return reinterpret_cast <const byte*>(m_hash);
+	return reinterpret_cast <const byte_t*>(m_hash);
 }
 
 
diff --git a/src/security/digest/messageDigest.cpp b/src/security/digest/messageDigest.cpp
index 1f86b94f..bba80023 100644
--- a/src/security/digest/messageDigest.cpp
+++ b/src/security/digest/messageDigest.cpp
@@ -33,7 +33,7 @@ namespace digest {
 
 const string messageDigest::getHexDigest() const
 {
-	const byte* hash = getDigest();
+	const byte_t* hash = getDigest();
 	const int len = getDigestLength();
 
 	static const unsigned char hex[] = "0123456789abcdef";
@@ -47,7 +47,6 @@ const string messageDigest::getHexDigest() const
 	}
 
 	return oss.str();
-
 }
 
 
diff --git a/src/security/digest/sha1/sha1MessageDigest.cpp b/src/security/digest/sha1/sha1MessageDigest.cpp
index f1726fd4..cd58f0c9 100644
--- a/src/security/digest/sha1/sha1MessageDigest.cpp
+++ b/src/security/digest/sha1/sha1MessageDigest.cpp
@@ -80,7 +80,7 @@ void sha1MessageDigest::init()
 }
 
 
-void sha1MessageDigest::update(const byte b)
+void sha1MessageDigest::update(const byte_t b)
 {
 	update(&b, 1);
 }
@@ -88,18 +88,18 @@ void sha1MessageDigest::update(const byte b)
 
 void sha1MessageDigest::update(const string& s)
 {
-	update(reinterpret_cast <const byte*>(s.data()), s.length());
+	update(reinterpret_cast <const byte_t*>(s.data()), s.length());
 }
 
 
-void sha1MessageDigest::update(const byte* buffer, const unsigned long offset,
+void sha1MessageDigest::update(const byte_t* buffer, const unsigned long offset,
 	const unsigned long len)
 {
 	update(buffer + offset, len);
 }
 
 
-void sha1MessageDigest::update(const byte* buffer, const unsigned long len)
+void sha1MessageDigest::update(const byte_t* buffer, const unsigned long len)
 {
 	unsigned int i, j;
 
@@ -142,10 +142,10 @@ void sha1MessageDigest::finalize()
 			 >> ((3-(i & 3)) * 8) ) & 255);  // Endian independent
 	}
 
-	update(reinterpret_cast <const byte*>("\200"), 1);
+	update(reinterpret_cast <const byte_t*>("\200"), 1);
 
 	while ((m_count[0] & 504) != 448)
-		update(reinterpret_cast <const byte*>("\0"), 1);
+		update(reinterpret_cast <const byte_t*>("\0"), 1);
 
 	update(finalcount, 8);  // Should cause a transform()
 
@@ -167,18 +167,18 @@ void sha1MessageDigest::finalize()
 
 void sha1MessageDigest::finalize(const string& s)
 {
-	finalize(reinterpret_cast <const byte*>(s.data()), s.length());
+	finalize(reinterpret_cast <const byte_t*>(s.data()), s.length());
 }
 
 
-void sha1MessageDigest::finalize(const byte* buffer, const unsigned long len)
+void sha1MessageDigest::finalize(const byte_t* buffer, const unsigned long len)
 {
 	update(buffer, len);
 	finalize();
 }
 
 
-void sha1MessageDigest::finalize(const byte* buffer,
+void sha1MessageDigest::finalize(const byte_t* buffer,
 	const unsigned long offset, const unsigned long len)
 {
 	finalize(buffer + offset, len);
@@ -252,7 +252,7 @@ const int sha1MessageDigest::getDigestLength() const
 }
 
 
-const byte* sha1MessageDigest::getDigest() const
+const byte_t* sha1MessageDigest::getDigest() const
 {
 	return m_digest;
 }