From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 3 May 2010 12:24:01 +0000 (+0000)
Subject: PR: 2250
X-Git-Tag: OpenSSL-fips-2_0-rc1~1112
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a033c3c72bc292a8795dc26a250f1b9e2dc27c63;p=oweals%2Fopenssl.git

PR: 2250
Submitted By: Ger Hobbelt <ger@hobbelt.com>

Don't overwrite return value with strlen(f).
---

diff --git a/crypto/x509/x509_cmp.c b/crypto/x509/x509_cmp.c
index a75876edbb..67a84d17d3 100644
--- a/crypto/x509/x509_cmp.c
+++ b/crypto/x509/x509_cmp.c
@@ -86,10 +86,9 @@ unsigned long X509_issuer_and_serial_hash(X509 *a)
 
 	EVP_MD_CTX_init(&ctx);
 	f=X509_NAME_oneline(a->cert_info->issuer,NULL,0);
-	ret=strlen(f);
 	if (!EVP_DigestInit_ex(&ctx, EVP_md5(), NULL))
 		goto err;
-	if (!EVP_DigestUpdate(&ctx,(unsigned char *)f,ret))
+	if (!EVP_DigestUpdate(&ctx,(unsigned char *)f,strlen(f)))
 		goto err;
 	OPENSSL_free(f);
 	if(!EVP_DigestUpdate(&ctx,(unsigned char *)a->cert_info->serialNumber->data,