6544b67f1f
Cherry-pick four upstream commits that prevent building of
otp_test_engine when LibreSSL-3.5.0 is used.
Since OpenWrt bumped LibreSSL to 3.5.3 the erlang host builds fail to
complete.
CC ../priv/obj/x86_64-pc-linux-gnu/otp_test_engine.o
otp_test_engine.c: In function 'test_engine_md5_init':
otp_test_engine.c:144:34: error: dereferencing pointer to incomplete type 'EVP_MD_CTX' {aka 'struct env_md_ctx_st'}
#define data(ctx) ((MD5_CTX *)ctx->md_data)
^~
Also switch to AUTORELEASE.
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
63 lines
1.7 KiB
Diff
63 lines
1.7 KiB
Diff
From 4d48c33d413957dc95fc8b921f9708eb0705c796 Mon Sep 17 00:00:00 2001
|
|
From: Hans Nilsson <hans@erlang.org>
|
|
Date: Wed, 16 Feb 2022 09:28:38 +0100
|
|
Subject: [PATCH] Update configure scripts
|
|
|
|
---
|
|
lib/crypto/configure | 17 +++++++++++++++++
|
|
1 file changed, 17 insertions(+)
|
|
|
|
--- a/lib/crypto/configure
|
|
+++ b/lib/crypto/configure
|
|
@@ -621,6 +621,7 @@ ac_includes_default="\
|
|
|
|
ac_subst_vars='LTLIBOBJS
|
|
LIBOBJS
|
|
+DISABLE_OTP_TEST_ENGINE
|
|
DISABLE_EVP_HMAC
|
|
DISABLE_EVP_DH
|
|
SSL_DYNAMIC_ONLY
|
|
@@ -747,6 +748,7 @@ with_ssl_rpath
|
|
enable_dynamic_ssl_lib
|
|
enable_evp_dh
|
|
enable_evp_hmac
|
|
+enable_otp_test_engine
|
|
enable_deprecated_warnings
|
|
enable_fips
|
|
'
|
|
@@ -1420,6 +1422,8 @@ Optional Features:
|
|
the crypto NIF
|
|
--disable-evp-dh intentionally undocumented workaround
|
|
--disable-evp-hmac intentionally undocumented workaround
|
|
+ --disable-otp-test-engine
|
|
+ intentionally undocumented workaround
|
|
--disable-deprecated-warnings
|
|
disable warnings for deprecated functions in
|
|
cryptolib (default is to warn, except for OpenSSL
|
|
@@ -5096,6 +5100,18 @@ else
|
|
fi
|
|
|
|
|
|
+
|
|
+# Check whether --enable-otp-test-engine was given.
|
|
+if test "${enable_otp_test_engine+set}" = set; then :
|
|
+ enableval=$enable_otp_test_engine; case "$enableval" in
|
|
+ no) DISABLE_OTP_TEST_ENGINE=yes;;
|
|
+ *) DISABLE_OTP_TEST_ENGINE=no;;
|
|
+ esac
|
|
+else
|
|
+ DISABLE_OTP_TEST_ENGINE=no
|
|
+fi
|
|
+
|
|
+
|
|
# Check whether --enable-deprecated_warnings was given.
|
|
if test "${enable_deprecated_warnings+set}" = set; then :
|
|
enableval=$enable_deprecated_warnings; case "$enableval" in
|
|
@@ -6319,6 +6335,7 @@ fi
|
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|