2 files changed, 3 insertions, 4 deletions
diff --git a/src/Crypto/Rmd160.c b/src/Crypto/Rmd160.c
index a441da36..cd215668 100644
--- a/src/Crypto/Rmd160.c
+++ b/src/Crypto/Rmd160.c
@@ -70,7 +70,7 @@ void RMD160Update (RMD160_CTX *ctx, const unsigned char *input, unsigned __int32
 #ifndef TC_WINDOWS_BOOT
 	uint64 len = lenArg, have, need;
 #else
-	uint16 len = (uint16) lenArg, have, need;
+	uint32 len = lenArg, have, need;
 #endif
 
 	/* Check how many bytes we already have and how many more we need. */
@@ -117,8 +117,7 @@ static void RMD160Pad(RMD160_CTX *ctx)
 	PUT_64BIT_LE(count, ctx->count);
 #else
 	*(uint32 *) (count + 4) = 0;
-	*(uint16 *) (count + 2) = 0;
-	*(uint16 *) (count + 0) = ctx->count;
+	*(uint32 *) (count + 0) = ctx->count;
 #endif
 
 	/* Pad out to 56 mod 64. */
diff --git a/src/Crypto/Rmd160.h b/src/Crypto/Rmd160.h
index 4bdd794a..4dfa38f1 100644
--- a/src/Crypto/Rmd160.h
+++ b/src/Crypto/Rmd160.h
@@ -16,7 +16,7 @@ typedef struct RMD160Context
 #ifndef TC_WINDOWS_BOOT
 	uint64 count;
 #else
-	uint16 count;
+	uint32 count;
 #endif
 	unsigned char buffer[RIPEMD160_BLOCK_LENGTH];
 } RMD160_CTX;