rpms/openssl/FC-6 openssl-0.9.8b-x509-name-cmp.patch, 1.1, 1.2 openssl.spec, 1.87, 1.88

[fedora-cvs-commits at redhat.com]

Author: tmraz

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

Modified Files:
	openssl-0.9.8b-x509-name-cmp.patch openssl.spec 
Log Message:
* Thu Nov 30 2006 Tomas Mraz <tmraz at redhat.com> 0.9.8b-8.3
- the previous change still didn't make X509_NAME_cmp transitive


openssl-0.9.8b-x509-name-cmp.patch:
 x509_cmp.c |    9 +--------
 1 files changed, 1 insertion(+), 8 deletions(-)

Index: openssl-0.9.8b-x509-name-cmp.patch
===================================================================
RCS file: /cvs/dist/rpms/openssl/FC-6/openssl-0.9.8b-x509-name-cmp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openssl-0.9.8b-x509-name-cmp.patch	23 Nov 2006 20:43:20 -0000	1.1
+++ openssl-0.9.8b-x509-name-cmp.patch	1 Dec 2006 09:42:43 -0000	1.2
@@ -1,21 +1,18 @@
-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))
++++ openssl-0.9.8b/crypto/x509/x509_cmp.c	2006-11-30 23:37:26.000000000 +0100
+@@ -282,14 +282,7 @@
+ 		nb=sk_X509_NAME_ENTRY_value(b->entries,i);
+ 		j=na->value->type-nb->value->type;
+ 		if (j)
+-			{
+-			nabit = ASN1_tag2bit(na->value->type);
+-			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);
- 			}
+-			j = asn1_string_memcmp(na->value, nb->value);
+-			}
++			return j;
  		else if (na->value->type == V_ASN1_PRINTABLESTRING)
+ 			j=nocase_spacenorm_cmp(na->value, nb->value);
+ 		else if (na->value->type == V_ASN1_IA5STRING


Index: openssl.spec
===================================================================
RCS file: /cvs/dist/rpms/openssl/FC-6/openssl.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- openssl.spec	23 Nov 2006 20:43:20 -0000	1.87
+++ openssl.spec	1 Dec 2006 09:42:43 -0000	1.88
@@ -21,7 +21,7 @@
 Summary: The OpenSSL toolkit
 Name: openssl
 Version: 0.9.8b
-Release: 8.0.1%{?dist}
+Release: 8.3%{?dist}
 Source: openssl-%{version}-usa.tar.bz2
 Source1: hobble-openssl
 Source2: Makefile.certificate
@@ -367,11 +367,14 @@
 %postun -p /sbin/ldconfig
 
 %changelog
-* Thu Nov 23 2006 Tomas Mraz <tmraz at redhat.com> 0.9.8b-8.0.1
+* Thu Nov 30 2006 Tomas Mraz <tmraz at redhat.com> 0.9.8b-8.3
+- the previous change still didn't make X509_NAME_cmp transitive
+
+* Thu Nov 23 2006 Tomas Mraz <tmraz at redhat.com> 0.9.8b-8.2
 - 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
+* Fri Nov  3 2006 Tomas Mraz <tmraz at redhat.com> 0.9.8b-8.1
 - aliasing bug in engine loading, patch by IBM (#213216)
 
 * Mon Oct  2 2006 Tomas Mraz <tmraz at redhat.com> 0.9.8b-8