mturk / rpms / openssl

Forked from rpms/openssl 3 years ago
Clone
bbe5f97
diff -up openssl-1.0.0/crypto/x509/x509_cmp.c.name-hash openssl-1.0.0/crypto/x509/x509_cmp.c
bbe5f97
--- openssl-1.0.0/crypto/x509/x509_cmp.c.name-hash	2010-01-12 18:27:10.000000000 +0100
bbe5f97
+++ openssl-1.0.0/crypto/x509/x509_cmp.c	2010-04-06 16:44:52.000000000 +0200
bbe5f97
@@ -236,10 +236,17 @@ unsigned long X509_NAME_hash_old(X509_NA
bbe5f97
 	{
bbe5f97
 	unsigned long ret=0;
bbe5f97
 	unsigned char md[16];
bbe5f97
+	EVP_MD_CTX ctx; 
bbe5f97
 
bbe5f97
 	/* Make sure X509_NAME structure contains valid cached encoding */
bbe5f97
 	i2d_X509_NAME(x,NULL);
bbe5f97
-	EVP_Digest(x->bytes->data, x->bytes->length, md, NULL, EVP_md5(), NULL);
bbe5f97
+
bbe5f97
+	EVP_MD_CTX_init(&ctx;;
bbe5f97
+	EVP_MD_CTX_set_flags(&ctx,EVP_MD_CTX_FLAG_ONESHOT | EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
bbe5f97
+        EVP_DigestInit_ex(&ctx, EVP_md5(), NULL)
bbe5f97
+		&& EVP_DigestUpdate(&ctx, x->bytes->data, x->bytes->length)
bbe5f97
+		&& EVP_DigestFinal_ex(&ctx, md, NULL);
bbe5f97
+	EVP_MD_CTX_cleanup(&ctx;;
bbe5f97
 
bbe5f97
 	ret=(	((unsigned long)md[0]     )|((unsigned long)md[1]<<8L)|
bbe5f97
 		((unsigned long)md[2]<<16L)|((unsigned long)md[3]<<24L)