diff --git a/src/CxbxKrnl/EmuSha.cpp b/src/CxbxKrnl/EmuSha.cpp
index b3494c405..0734f69d2 100644
--- a/src/CxbxKrnl/EmuSha.cpp
+++ b/src/CxbxKrnl/EmuSha.cpp
@@ -249,7 +249,7 @@ void SHA1Update(SHA1_CTX* context, const unsigned char* data, uint32_t len)
 
 
 /* Add padding and return the message digest. */
-void SHA1Final(unsigned char digest[20], SHA1_CTX* context)
+void SHA1Final(unsigned char digest[A_SHA_DIGEST_LEN], SHA1_CTX* context)
 {
 	unsigned i;
 
@@ -288,7 +288,7 @@ void SHA1Final(unsigned char digest[20], SHA1_CTX* context)
 		SHA1Update(context, &c, 1);
 	}
 	SHA1Update(context, finalcount, 8); /* Should cause a SHA1Transform() */
-	for (i = 0; i < 20; i++)
+	for (i = 0; i < A_SHA_DIGEST_LEN; i++)
 	{
 		digest[i] = (unsigned char)
 			((context->state[i >> 2] >> ((3 - (i & 3)) * 8)) & 255);
@@ -298,7 +298,7 @@ void SHA1Final(unsigned char digest[20], SHA1_CTX* context)
 	memset(&finalcount, '\0', sizeof(finalcount));
 }
 
-void CalcSHA1Hash(unsigned char digest[20], const unsigned char* data, uint32_t len)
+void CalcSHA1Hash(unsigned char digest[A_SHA_DIGEST_LEN], const unsigned char* data, uint32_t len)
 {
 	SHA1_CTX ctx;
 
diff --git a/src/CxbxKrnl/EmuSha.h b/src/CxbxKrnl/EmuSha.h
index 15b71ea90..9398af8a5 100644
--- a/src/CxbxKrnl/EmuSha.h
+++ b/src/CxbxKrnl/EmuSha.h
@@ -49,7 +49,7 @@ typedef struct _SHA1_CTX
 
 void SHA1Init(SHA1_CTX* context);
 void SHA1Update(SHA1_CTX* context, const unsigned char* data, uint32_t len);
-void SHA1Final(unsigned char digest[20], SHA1_CTX* context);
-void CalcSHA1Hash(unsigned char digest[20], const unsigned char* data, uint32_t len);
+void SHA1Final(unsigned char digest[A_SHA_DIGEST_LEN], SHA1_CTX* context);
+void CalcSHA1Hash(unsigned char digest[A_SHA_DIGEST_LEN], const unsigned char* data, uint32_t len);
 
 #endif