diff --git a/CHANGES b/CHANGES
index 684f8f750a62aa4413b6eb791c009c75a694fa6f..0087fd55fb95e6ac044b70ee1e12e6d0cde36d42 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,11 @@
 
  Changes between 0.9.1c and 0.9.2
 
+  *) Change type of another md_len variable in pk7_doit.c:PKCS7_dataFinal()
+     from `int' to `unsigned int' because it's a length and initialized by
+     EVP_DigestFinal() which expects an `unsigned int *'.
+     [Richard Levitte <levitte@stacken.kth.se>]
+
   *) Don't hard-code path to Perl interpreter on shebang line of Configure
      script. Instead use the usual Shell->Perl transition trick.
      [Ralf S. Engelschall]
diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c
index 21027adbd313c4edf252e9ae1f50777143572955..9d590f595c147dff7689ee5340b18624171c15e1 100644
--- a/crypto/pkcs7/pk7_doit.c
+++ b/crypto/pkcs7/pk7_doit.c
@@ -715,7 +715,7 @@ PKCS7_SIGNER_INFO *si;
 	if ((sk != NULL) && (sk_num(sk) != 0))
 		{
 		unsigned char md_dat[EVP_MAX_MD_SIZE];
-		int md_len;
+		unsigned int md_len;
 		ASN1_OCTET_STRING *message_digest;
 
 		EVP_DigestFinal(&mdc_tmp,md_dat,&md_len);