rpms/openssl/FC-6 openssl-0.9.8b-aliasing-bug.patch, NONE, 1.1 openssl-0.9.8b-x509-name-cmp.patch, NONE, 1.1 openssl.spec, 1.86, 1.87

[fedora-cvs-commits at redhat.com]

Author: tmraz

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

Modified Files:
	openssl.spec 
Added Files:
	openssl-0.9.8b-aliasing-bug.patch 
	openssl-0.9.8b-x509-name-cmp.patch 
Log Message:
- sync with devel


openssl-0.9.8b-aliasing-bug.patch:
 dso_dlfcn.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE openssl-0.9.8b-aliasing-bug.patch ---

This patch fixes a violation of the C aliasing rules that can cause
miscompilation with some compiler versions.

--- openssl-0.9.8b/crypto/dso/dso_dlfcn.c.orig	2006-10-30 18:21:35.000000000 +0100
+++ openssl-0.9.8b/crypto/dso/dso_dlfcn.c	2006-10-30 18:21:37.000000000 +0100
@@ -237,7 +237,7 @@ static void *dlfcn_bind_var(DSO *dso, co
 static DSO_FUNC_TYPE dlfcn_bind_func(DSO *dso, const char *symname)
 	{
 	void *ptr;
-	DSO_FUNC_TYPE sym, *tsym = &sym;
+	DSO_FUNC_TYPE sym;
 
 	if((dso == NULL) || (symname == NULL))
 		{
@@ -255,7 +255,7 @@ static DSO_FUNC_TYPE dlfcn_bind_func(DSO
 		DSOerr(DSO_F_DLFCN_BIND_FUNC,DSO_R_NULL_HANDLE);
 		return(NULL);
 		}
-	*(void **)(tsym) = dlsym(ptr, symname);
+	sym = dlsym(ptr, symname);
 	if(sym == NULL)
 		{
 		DSOerr(DSO_F_DLFCN_BIND_FUNC,DSO_R_SYM_FAILURE);

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/FC-6/openssl.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- openssl.spec	2 Oct 2006 08:37:59 -0000	1.86
+++ openssl.spec	23 Nov 2006 20:43:20 -0000	1.87
@@ -21,7 +21,7 @@
 Summary: The OpenSSL toolkit
 Name: openssl
 Version: 0.9.8b
-Release: 8
+Release: 8.0.1%{?dist}
 Source: openssl-%{version}-usa.tar.bz2
 Source1: hobble-openssl
 Source2: Makefile.certificate
@@ -60,6 +60,8 @@
 Patch58: openssl-0.9.8b-cve-2006-2940.patch
 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
@@ -129,6 +131,8 @@
 %patch58 -p0 -b .parasitic
 %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}`
@@ -363,6 +367,13 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Nov 23 2006 Tomas Mraz <tmraz at redhat.com> 0.9.8b-8.0.1
+- 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)
+
 * Mon Oct  2 2006 Tomas Mraz <tmraz at redhat.com> 0.9.8b-8
 - CVE-2006-2940 fix was incorrect (#208744)