rpms/openssl/devel openssl-0.9.8b-x509-name-cmp.patch, NONE, 1.1 openssl.spec, 1.87, 1.88

[fedora-cvs-commits at redhat.com]

Author: tmraz

Update of /cvs/dist/rpms/openssl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10838

Modified Files:
	openssl.spec 
Added Files:
	openssl-0.9.8b-x509-name-cmp.patch 
Log Message:
* Thu Nov 23 2006 Tomas Mraz <tmraz at redhat.com> 0.9.8b-10
- make X509_NAME_cmp transitive otherwise certificate lookup
  is broken (#216050)
- Resolves: rhbz#216050


openssl-0.9.8b-x509-name-cmp.patch:
 x509_cmp.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE openssl-0.9.8b-x509-name-cmp.patch ---
Make X509_NAME_cmp transitive.
--- openssl-0.9.8b/crypto/x509/x509_cmp.c.name-cmp	2004-12-01 02:45:30.000000000 +0100
+++ openssl-0.9.8b/crypto/x509/x509_cmp.c	2006-11-23 21:21:40.000000000 +0100
@@ -287,7 +287,16 @@
 			nbbit = ASN1_tag2bit(nb->value->type);
 			if (!(nabit & STR_TYPE_CMP) ||
 				!(nbbit & STR_TYPE_CMP))
-				return j;
+				{
+				if (!(nabit & STR_TYPE_CMP) &&
+					(nbbit & STR_TYPE_CMP))
+					return -1;
+				else if ((nabit & STR_TYPE_CMP) &&
+					!(nbbit & STR_TYPE_CMP))
+					return 1;
+				else
+					return j;
+				}
 			j = asn1_string_memcmp(na->value, nb->value);
 			}
 		else if (na->value->type == V_ASN1_PRINTABLESTRING)


Index: openssl.spec
===================================================================
RCS file: /cvs/dist/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- openssl.spec	2 Nov 2006 21:16:00 -0000	1.87
+++ openssl.spec	23 Nov 2006 20:38:24 -0000	1.88
@@ -21,7 +21,7 @@
 Summary: The OpenSSL toolkit
 Name: openssl
 Version: 0.9.8b
-Release: 9%{?dist}
+Release: 10%{?dist}
 Source: openssl-%{version}-usa.tar.bz2
 Source1: hobble-openssl
 Source2: Makefile.certificate
@@ -61,6 +61,7 @@
 Patch59: openssl-0.9.8b-cve-2006-3738.patch
 Patch60: openssl-0.9.8b-cve-2006-4343.patch
 Patch61: openssl-0.9.8b-aliasing-bug.patch
+Patch62: openssl-0.9.8b-x509-name-cmp.patch
 
 License: BSDish
 Group: System Environment/Libraries
@@ -131,6 +132,7 @@
 %patch59 -p0 -b .shared-ciphers
 %patch60 -p0 -b .client-dos
 %patch61 -p1 -b .aliasing-bug
+%patch62 -p1 -b .name-cmp
 
 # Modify the various perl scripts to reference perl in the right location.
 perl util/perlpath.pl `dirname %{__perl}`
@@ -365,6 +367,10 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Nov 23 2006 Tomas Mraz <tmraz at redhat.com> 0.9.8b-10
+- make X509_NAME_cmp transitive otherwise certificate lookup
+  is broken (#216050)
+
 * Thu Nov  2 2006 Tomas Mraz <tmraz at redhat.com> 0.9.8b-9
 - aliasing bug in engine loading, patch by IBM (#213216)