From 0a5657ab94678cce3a2c9dde59d98c2a47123cc3 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Fri, 3 Dec 2010 14:19:39 +0100 Subject: [PATCH] - replace the revert for the s390x bignum asm routines with fix from upstream --- .gitignore | 1 + openssl-1.0.0b-s390bn.patch | 14 -------------- ...b-version.patch => openssl-1.0.0c-version.patch | 12 ++++++------ openssl.spec | 8 +++----- sources | 2 +- 5 files changed, 11 insertions(+), 26 deletions(-) delete mode 100644 openssl-1.0.0b-s390bn.patch rename openssl-1.0.0b-version.patch => openssl-1.0.0c-version.patch (60%) diff --git a/.gitignore b/.gitignore index 7e9e24e..3c6b80c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ openssl-1.0.0a-usa.tar.bz2 /openssl-1.0.0b-usa.tar.bz2 +/openssl-1.0.0c-usa.tar.bz2 diff --git a/openssl-1.0.0b-s390bn.patch b/openssl-1.0.0b-s390bn.patch deleted file mode 100644 index 25e9dfd..0000000 --- a/openssl-1.0.0b-s390bn.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: openssl/crypto/bn/asm/s390x.S -RCS File: /v/openssl/cvs/openssl/crypto/bn/asm/s390x.S,v -rcsdiff -q -kk '-r1.1.4.1' '-r1.1.4.2' -u '/v/openssl/cvs/openssl/crypto/bn/asm/s390x.S,v' 2>/dev/null ---- openssl/crypto/bn/asm/s390x.S 2010/09/10 14:55:24 1.1.4.1 -+++ openssl/crypto/bn/asm/s390x.S 2010/11/22 21:57:07 1.1.4.2 -@@ -131,7 +131,7 @@ - brct %r4,.Loop4_mul - - la %r10,1(%r10) // see if len%4 is zero ... -- brct %r10,.Loop1_madd // without touching condition code:-) -+ brct %r10,.Loop1_mul // without touching condition code:-) - - .Lend_mul: - alcgr %r8,zero // collect carry bit diff --git a/openssl-1.0.0b-version.patch b/openssl-1.0.0c-version.patch similarity index 60% rename from openssl-1.0.0b-version.patch rename to openssl-1.0.0c-version.patch index bdb6ab6..4ac8277 100644 --- a/openssl-1.0.0b-version.patch +++ b/openssl-1.0.0c-version.patch @@ -1,22 +1,22 @@ -diff -up openssl-1.0.0b/crypto/opensslv.h.version openssl-1.0.0b/crypto/opensslv.h ---- openssl-1.0.0b/crypto/opensslv.h.version 2010-11-16 17:31:23.000000000 +0100 -+++ openssl-1.0.0b/crypto/opensslv.h 2010-11-16 17:32:59.000000000 +0100 +diff -up openssl-1.0.0c/crypto/opensslv.h.version openssl-1.0.0c/crypto/opensslv.h +--- openssl-1.0.0c/crypto/opensslv.h.version 2010-12-03 11:55:54.000000000 +0100 ++++ openssl-1.0.0c/crypto/opensslv.h 2010-12-03 11:57:25.000000000 +0100 @@ -25,7 +25,8 @@ * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * major minor fix final patch/beta) */ --#define OPENSSL_VERSION_NUMBER 0x1000002f +-#define OPENSSL_VERSION_NUMBER 0x1000003f +/* we have to keep the version number to not break the abi */ +#define OPENSSL_VERSION_NUMBER 0x10000003 #ifdef OPENSSL_FIPS - #define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0b-fips 16 Nov 2010" + #define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0c-fips 2 Dec 2010" #else @@ -83,7 +84,7 @@ * should only keep the versions that are binary compatible with the current. */ #define SHLIB_VERSION_HISTORY "" -#define SHLIB_VERSION_NUMBER "1.0.0" -+#define SHLIB_VERSION_NUMBER "1.0.0b" ++#define SHLIB_VERSION_NUMBER "1.0.0c" #endif /* HEADER_OPENSSLV_H */ diff --git a/openssl.spec b/openssl.spec index badb2a9..cf5a9fb 100644 --- a/openssl.spec +++ b/openssl.spec @@ -20,8 +20,8 @@ Summary: A general purpose cryptography library with TLS implementation Name: openssl -Version: 1.0.0b -Release: 3%{?dist} +Version: 1.0.0c +Release: 1%{?dist} # We remove certain patented algorithms from the openssl source tarball # with the hobble-openssl script which is included below. Source: openssl-%{version}-usa.tar.bz2 @@ -44,7 +44,6 @@ Patch7: openssl-1.0.0-timezone.patch Patch23: openssl-1.0.0-beta4-default-paths.patch Patch24: openssl-0.9.8j-bad-mime.patch Patch25: openssl-1.0.0a-manfix.patch -Patch26: openssl-1.0.0b-s390bn.patch # Functionality changes Patch32: openssl-0.9.8g-ia64.patch Patch33: openssl-1.0.0-beta4-ca-dir.patch @@ -60,7 +59,7 @@ Patch45: openssl-0.9.8j-env-nozlib.patch Patch47: openssl-1.0.0-beta5-readme-warning.patch Patch49: openssl-1.0.0-beta4-algo-doc.patch Patch50: openssl-1.0.0-beta4-dtls1-abi.patch -Patch51: openssl-1.0.0b-version.patch +Patch51: openssl-1.0.0c-version.patch Patch52: openssl-1.0.0b-aesni.patch Patch53: openssl-1.0.0-name-hash.patch # Backported fixes including security fixes @@ -127,7 +126,6 @@ from other formats to the formats used by the OpenSSL toolkit. %patch23 -p1 -b .default-paths %patch24 -p1 -b .bad-mime %patch25 -p1 -b .manfix -%patch26 -p1 -b .s390bn %patch32 -p1 -b .ia64 %patch33 -p1 -b .ca-dir diff --git a/sources b/sources index e31429d..16f9c6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0efec5b9c8fc10356f4d52732f91f8ea openssl-1.0.0b-usa.tar.bz2 +4f47a00408abc9904788ba596992085f openssl-1.0.0c-usa.tar.bz2