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

- detect duplicates in add_dir properly (#206346)

Browse Source
This commit is contained in:
Tomáš Mráz 2006-12-11 19:46:13 +00:00
parent 4ca06fa547
commit fba756feb1
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
openssl-0.9.8b-x509-add-dir.patch Normal file
View File

@ -0,0 +1,33 @@
--- openssl-0.9.8b/crypto/x509/by_dir.c.add-dir 2005-07-03 15:15:53.000000000 +0200
+++ openssl-0.9.8b/crypto/x509/by_dir.c 2006-10-03 15:14:06.000000000 +0200
@@ -189,7 +189,7 @@
s=dir;
p=s;
- for (;;)
+ for (;;p++)
{
if ((*p == LIST_SEPARATOR_CHAR) || (*p == '\0'))
{
@@ -198,8 +198,11 @@
len=(int)(p-ss);
if (len == 0) continue;
for (j=0; j<ctx->num_dirs; j++)
- if (strncmp(ctx->dirs[j],ss,(unsigned int)len) == 0)
- continue;
+ if (strlen(ctx->dirs[j]) == len &&
+ strncmp(ctx->dirs[j],ss,(unsigned int)len) == 0)
+ break;
+ if (j<ctx->num_dirs)
+ continue;
if (ctx->num_dirs_alloced < (ctx->num_dirs+1))
{
ctx->num_dirs_alloced+=10;
@@ -231,7 +234,6 @@
ctx->num_dirs++;
}
if (*p == '\0') break;
- p++;
}
return(1);
}

7
openssl.spec
View File

@ -21,7 +21,7 @@
Summary: The OpenSSL toolkit
Name: openssl
Version: 0.9.8b
Release: 11%{?dist}
Release: 12%{?dist}
Source: openssl-%{version}-usa.tar.bz2
Source1: hobble-openssl
Source2: Makefile.certificate
@ -62,6 +62,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
Patch63: openssl-0.9.8b-x509-add-dir.patch
License: BSDish
Group: System Environment/Libraries
@ -133,6 +134,7 @@ from other formats to the formats used by the OpenSSL toolkit.
%patch60 -p0 -b .client-dos
%patch61 -p1 -b .aliasing-bug
%patch62 -p1 -b .name-cmp
%patch63 -p1 -b .add-dir
# Modify the various perl scripts to reference perl in the right location.
perl util/perlpath.pl `dirname %{__perl}`
@ -367,6 +369,9 @@ rm -rf $RPM_BUILD_ROOT/%{_bindir}/openssl_fips_fingerprint
%postun -p /sbin/ldconfig
%changelog
* Mon Dec 11 2006 Tomas Mraz <tmraz@redhat.com> 0.9.8b-12
- detect duplicates in add_dir properly (#206346)
* Thu Nov 30 2006 Tomas Mraz <tmraz@redhat.com> 0.9.8b-11
- the previous change still didn't make X509_NAME_cmp transitive