From 2d8446ff1a54450aad3933c0df334c147fb7691d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Fri, 4 Sep 2009 12:08:42 +0000 Subject: [PATCH] - temporarily disable x86_64 camellia assembler code (#521127) --- openssl-1.0.0-beta3-cmll-noasm.patch | 12 ++++++++++++ openssl.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 openssl-1.0.0-beta3-cmll-noasm.patch diff --git a/openssl-1.0.0-beta3-cmll-noasm.patch b/openssl-1.0.0-beta3-cmll-noasm.patch new file mode 100644 index 0000000..2df67a5 --- /dev/null +++ b/openssl-1.0.0-beta3-cmll-noasm.patch @@ -0,0 +1,12 @@ +diff -up openssl-1.0.0-beta3/Configure.cmll-noasm openssl-1.0.0-beta3/Configure +--- openssl-1.0.0-beta3/Configure.cmll-noasm 2009-09-04 13:44:53.000000000 +0200 ++++ openssl-1.0.0-beta3/Configure 2009-09-04 13:46:08.000000000 +0200 +@@ -125,7 +125,7 @@ my $x86_asm="x86cpuid.o:bn-586.o co-586. + + my $x86_elf_asm="$x86_asm:elf"; + +-my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o"; ++my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o:::wp-x86_64.o:"; + my $ia64_asm="ia64cpuid.o:bn-ia64.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o rc4_skey.o:::::void"; + my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o:des_enc-sparc.o fcrypt_b.o:aes_core.o aes_cbc.o aes-sparcv9.o:::sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o:::::::void"; + my $sparcv8_asm=":sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::::void"; diff --git a/openssl.spec b/openssl.spec index ce1c96f..f0cf488 100644 --- a/openssl.spec +++ b/openssl.spec @@ -23,7 +23,7 @@ Summary: A general purpose cryptography library with TLS implementation Name: openssl Version: 1.0.0 -Release: 0.6.%{beta}%{?dist} +Release: 0.7.%{beta}%{?dist} # We remove certain patented algorithms from the openssl source tarball # with the hobble-openssl script which is included below. Source: openssl-%{version}-%{beta}-usa.tar.bz2 @@ -63,6 +63,7 @@ Patch49: openssl-0.9.8k-algo-doc.patch Patch50: openssl-1.0.0-beta3-curl.patch Patch51: openssl-1.0.0-beta3-const.patch Patch52: openssl-1.0.0-beta3-dss1.patch +Patch53: openssl-1.0.0-beta3-cmll-noasm.patch # Backported fixes including security fixes Patch60: openssl-1.0.0-beta3-namingstr.patch Patch61: openssl-1.0.0-beta3-namingblk.patch @@ -147,6 +148,7 @@ from other formats to the formats used by the OpenSSL toolkit. %patch50 -p1 -b .curl %patch51 -p1 -b .const %patch52 -p1 -b .dss1 +%patch53 -p1 -b .cmll-noasm %patch60 -p1 -b .namingstr %patch61 -p1 -b .namingblk @@ -397,6 +399,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipscanister.* %postun -p /sbin/ldconfig %changelog +* Fri Sep 4 2009 Tomas Mraz 1.0.0-0.7.beta3 +- temporarily disable x86_64 camellia assembler code (#521127) + * Mon Aug 31 2009 Tomas Mraz 1.0.0-0.6.beta3 - fix openssl dgst -dss1 (#520152)