rpms/erlang
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Erlang: fix EC detection

Browse Source 
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
This commit is contained in:
Peter Lemenkov 2019-02-04 13:13:52 +03:00
parent 6225c31c98
commit 8b984b11a7
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erlang.spec
View File

@ -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 <lemenkov@gmail.com> - 20.3.8.18-2
- Fix EC detection
* Tue Jan 22 2019 Peter Lemenkov <lemenkov@gmail.com> - 20.3.8.18-1
- Ver. 20.3.8.18

22
otp-0012-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-function-i.patch Normal file
View File

@ -0,0 +1,22 @@
From: "Matwey V. Kornilov" <matwey.kornilov@gmail.com>
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