From c79bed9e7613e0a2fba665bfa1e7b2accc60bed3 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Dec 08 2015 14:56:50 +0000 Subject: remove unimplemented EC method from header (#1289599) --- diff --git a/openssl-1.0.2e-remove-nistp224.patch b/openssl-1.0.2e-remove-nistp224.patch new file mode 100644 index 0000000..22b99c1 --- /dev/null +++ b/openssl-1.0.2e-remove-nistp224.patch @@ -0,0 +1,15 @@ +diff -up openssl-1.0.2e/crypto/ec/ec.h.nistp224 openssl-1.0.2e/crypto/ec/ec.h +--- openssl-1.0.2e/crypto/ec/ec.h.nistp224 2015-12-04 14:00:57.000000000 +0100 ++++ openssl-1.0.2e/crypto/ec/ec.h 2015-12-08 15:51:37.046747916 +0100 +@@ -149,11 +149,6 @@ const EC_METHOD *EC_GFp_mont_method(void + const EC_METHOD *EC_GFp_nist_method(void); + + # ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 +-/** Returns 64-bit optimized methods for nistp224 +- * \return EC_METHOD object +- */ +-const EC_METHOD *EC_GFp_nistp224_method(void); +- + /** Returns 64-bit optimized methods for nistp256 + * \return EC_METHOD object + */ diff --git a/openssl.spec b/openssl.spec index fe01e76..ebe0c68 100644 --- a/openssl.spec +++ b/openssl.spec @@ -23,7 +23,7 @@ Summary: Utilities from the general purpose cryptography library with TLS implementation Name: openssl Version: 1.0.2e -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 # We have to remove certain patented algorithms from the openssl source # tarball with the hobble-openssl script which is included below. @@ -82,6 +82,7 @@ Patch90: openssl-1.0.2a-enc-fail.patch Patch92: openssl-1.0.2a-system-cipherlist.patch Patch93: openssl-1.0.2a-disable-sslv2v3.patch Patch94: openssl-1.0.2d-secp256k1.patch +Patch95: openssl-1.0.2e-remove-nistp224.patch # Backported fixes including security fixes Patch80: openssl-1.0.2e-wrap-pad.patch Patch81: openssl-1.0.2a-padlock64.patch @@ -203,6 +204,7 @@ cp %{SOURCE12} %{SOURCE13} crypto/ec/ %patch92 -p1 -b .system %patch93 -p1 -b .v2v3 %patch94 -p1 -b .secp256k1 +%patch95 -p1 -b .nistp224 %patch80 -p1 -b .wrap %patch81 -p1 -b .padlock64 @@ -488,6 +490,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipscanister.* %postun libs -p /sbin/ldconfig %changelog +* Tue Dec 8 2015 Tomáš Mráz 1.0.2e-3 +- remove unimplemented EC method from header (#1289599) + * Mon Dec 7 2015 Tomáš Mráz 1.0.2e-2 - the fast nistp implementation works only on little endian architectures