From 8b984b11a75acbbe05a1cff4f4a19da1edcb9e87 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 4 Feb 2019 13:13:52 +0300 Subject: [PATCH] Erlang: fix EC detection Signed-off-by: Peter Lemenkov --- erlang.spec | 6 ++++- ...e-EC_GROUP_new_curve_GF2m-function-i.patch | 22 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 otp-0012-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-function-i.patch diff --git a/erlang.spec b/erlang.spec index c839044..09f1e79 100644 --- a/erlang.spec +++ b/erlang.spec @@ -61,7 +61,7 @@ Name: erlang Version: 20.3.8.18 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -104,6 +104,7 @@ Patch8: otp-0008-Add-extra-search-directory.patch Patch9: otp-0009-Avoid-forking-sed-to-get-basename.patch Patch10: otp-0010-Load-man-pages-from-system-wide-directory.patch Patch11: otp-0011-Improve-nodes-querying.patch +Patch12: otp-0012-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-function-i.patch # end of autogenerated patch tag list BuildRequires: gcc @@ -2231,6 +2232,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Mon Feb 04 2019 Peter Lemenkov - 20.3.8.18-2 +- Fix EC detection + * Tue Jan 22 2019 Peter Lemenkov - 20.3.8.18-1 - Ver. 20.3.8.18 diff --git a/otp-0012-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-function-i.patch b/otp-0012-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-function-i.patch new file mode 100644 index 0000000..dafdd31 --- /dev/null +++ b/otp-0012-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-function-i.patch @@ -0,0 +1,22 @@ +From: "Matwey V. Kornilov" +Date: Sat, 21 Dec 2013 00:13:35 +0400 +Subject: [PATCH] In openssl 1.0.1e EC_GROUP_new_curve_GF2m function is wrapped + by #ifndef OPENSSL_NO_EC2M. We have to check whether OPENSSL_NO_EC2M is set, + and if it is, then we do not have EC_GROUP_new_curve_GF2m function and do not + HAVE_EC. + + +diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c +index 6dd263adb2..cc1bcc1fb3 100644 +--- a/lib/crypto/c_src/crypto.c ++++ b/lib/crypto/c_src/crypto.c +@@ -151,7 +151,8 @@ + #if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,8,'o') \ + && !defined(OPENSSL_NO_EC) \ + && !defined(OPENSSL_NO_ECDH) \ +- && !defined(OPENSSL_NO_ECDSA) ++ && !defined(OPENSSL_NO_ECDSA) \ ++ && !defined(OPENSSL_NO_EC2M) + # define HAVE_EC + #endif +