jonathan/openssl
1
0
Fork 0
forked from rpms/openssl
Code Pull Requests Activity

- the previous change still didn't make X509_NAME_cmp transitive

Browse Source
This commit is contained in:
Tomáš Mráz 2006-11-30 23:10:43 +00:00
parent f0fb64db28
commit 4ca06fa547
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
openssl-0.9.8b-x509-name-cmp.patch
View File

@ -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.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 +++ openssl-0.9.8b/crypto/x509/x509_cmp.c 2006-11-30 23:37:26.000000000 +0100
@@ -287,7 +287,16 @@ @@ -282,14 +282,7 @@
nbbit = ASN1_tag2bit(nb->value->type); nb=sk_X509_NAME_ENTRY_value(b->entries,i);
if (!(nabit & STR_TYPE_CMP) || j=na->value->type-nb->value->type;
!(nbbit & STR_TYPE_CMP)) 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; - return j;
+ { - j = asn1_string_memcmp(na->value, nb->value);
+ if (!(nabit & STR_TYPE_CMP) && - }
+ (nbbit & STR_TYPE_CMP)) + return j;
+ 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) else if (na->value->type == V_ASN1_PRINTABLESTRING)
j=nocase_spacenorm_cmp(na->value, nb->value);
else if (na->value->type == V_ASN1_IA5STRING

5
openssl.spec
View File

@ -21,7 +21,7 @@
Summary: The OpenSSL toolkit Summary: The OpenSSL toolkit
Name: openssl Name: openssl
Version: 0.9.8b Version: 0.9.8b
Release: 10%{?dist} Release: 11%{?dist}
Source: openssl-%{version}-usa.tar.bz2 Source: openssl-%{version}-usa.tar.bz2
Source1: hobble-openssl Source1: hobble-openssl
Source2: Makefile.certificate Source2: Makefile.certificate
@ -367,6 +367,9 @@ rm -rf $RPM_BUILD_ROOT/%{_bindir}/openssl_fips_fingerprint
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%changelog %changelog
* Thu Nov 30 2006 Tomas Mraz <tmraz@redhat.com> 0.9.8b-11
- the previous change still didn't make X509_NAME_cmp transitive
* Thu Nov 23 2006 Tomas Mraz <tmraz@redhat.com> 0.9.8b-10 * Thu Nov 23 2006 Tomas Mraz <tmraz@redhat.com> 0.9.8b-10
- make X509_NAME_cmp transitive otherwise certificate lookup - make X509_NAME_cmp transitive otherwise certificate lookup
is broken (#216050) is broken (#216050)