rpms/openssl/F-13 openssl-1.0.0-name-hash.patch, 1.2, 1.3 openssl-1.0.0-dtls1-backports.patch, 1.1, NONE

Tomáš Mráz tmraz at fedoraproject.org
Fri Jun 4 14:16:25 UTC 2010


Author: tmraz

Update of /cvs/pkgs/rpms/openssl/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21305

Added Files:
	openssl-1.0.0-name-hash.patch 
Removed Files:
	openssl-1.0.0-dtls1-backports.patch 
Log Message:
- oops wrong patch removed


openssl-1.0.0-name-hash.patch:
 x509_cmp.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Index: openssl-1.0.0-name-hash.patch
===================================================================
RCS file: openssl-1.0.0-name-hash.patch
diff -N openssl-1.0.0-name-hash.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openssl-1.0.0-name-hash.patch	4 Jun 2010 14:16:25 -0000	1.3
@@ -0,0 +1,22 @@
+diff -up openssl-1.0.0/crypto/x509/x509_cmp.c.name-hash openssl-1.0.0/crypto/x509/x509_cmp.c
+--- openssl-1.0.0/crypto/x509/x509_cmp.c.name-hash	2010-01-12 18:27:10.000000000 +0100
++++ openssl-1.0.0/crypto/x509/x509_cmp.c	2010-04-06 16:44:52.000000000 +0200
+@@ -236,10 +236,17 @@ unsigned long X509_NAME_hash_old(X509_NA
+ 	{
+ 	unsigned long ret=0;
+ 	unsigned char md[16];
++	EVP_MD_CTX ctx; 
+ 
+ 	/* Make sure X509_NAME structure contains valid cached encoding */
+ 	i2d_X509_NAME(x,NULL);
+-	EVP_Digest(x->bytes->data, x->bytes->length, md, NULL, EVP_md5(), NULL);
++
++	EVP_MD_CTX_init(&ctx);
++	EVP_MD_CTX_set_flags(&ctx,EVP_MD_CTX_FLAG_ONESHOT | EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
++        EVP_DigestInit_ex(&ctx, EVP_md5(), NULL)
++		&& EVP_DigestUpdate(&ctx, x->bytes->data, x->bytes->length)
++		&& EVP_DigestFinal_ex(&ctx, md, NULL);
++	EVP_MD_CTX_cleanup(&ctx);
+ 
+ 	ret=(	((unsigned long)md[0]     )|((unsigned long)md[1]<<8L)|
+ 		((unsigned long)md[2]<<16L)|((unsigned long)md[3]<<24L)


--- openssl-1.0.0-dtls1-backports.patch DELETED ---



More information about the scm-commits mailing list