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>
89 lines
2.4 KiB
Diff
89 lines
2.4 KiB
Diff
From 2f27f4bf85971dc8d8e0c2dcef133729835458c5 Mon Sep 17 00:00:00 2001
|
|
From: Hans Nilsson <hans@erlang.org>
|
|
Date: Mon, 21 Feb 2022 14:58:35 +0100
|
|
Subject: [PATCH] Update configure scripts
|
|
|
|
---
|
|
lib/crypto/configure | 50 ++++++++++++++++++++++++++++++++++++++++++--
|
|
1 file changed, 48 insertions(+), 2 deletions(-)
|
|
|
|
--- a/lib/crypto/configure
|
|
+++ b/lib/crypto/configure
|
|
@@ -1423,7 +1423,9 @@ Optional Features:
|
|
--disable-evp-dh intentionally undocumented workaround
|
|
--disable-evp-hmac intentionally undocumented workaround
|
|
--disable-otp-test-engine
|
|
- intentionally undocumented workaround
|
|
+ Disable build of the otp_test_engine. (default is
|
|
+ --enable-otp-test-engine, unless for LibreSSL >=
|
|
+ 3.5.0 where default is --disable-otp-test-engine)
|
|
--disable-deprecated-warnings
|
|
disable warnings for deprecated functions in
|
|
cryptolib (default is to warn, except for OpenSSL
|
|
@@ -5108,7 +5110,7 @@ if test "${enable_otp_test_engine+set}"
|
|
*) DISABLE_OTP_TEST_ENGINE=no;;
|
|
esac
|
|
else
|
|
- DISABLE_OTP_TEST_ENGINE=no
|
|
+ DISABLE_OTP_TEST_ENGINE=default
|
|
fi
|
|
|
|
|
|
@@ -5300,6 +5302,28 @@ else
|
|
fi
|
|
rm -f conftest*
|
|
|
|
+
|
|
+if test "x$DISABLE_OTP_TEST_ENGINE" = "xdefault"; then
|
|
+# Get default value for the --disable-otp-test-engine. Depends on cryptolib version
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+
|
|
+#include <openssl/opensslv.h>
|
|
+#if LIBRESSL_VERSION_NUMBER >= 0x3050000fL
|
|
+yes
|
|
+#endif
|
|
+
|
|
+_ACEOF
|
|
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
|
+ $EGREP "^yes.?$" >/dev/null 2>&1; then :
|
|
+ DISABLE_OTP_TEST_ENGINE=yes
|
|
+else
|
|
+ DISABLE_OTP_TEST_ENGINE=no
|
|
+fi
|
|
+rm -f conftest*
|
|
+
|
|
+ fi
|
|
+
|
|
CPPFLAGS="$save_CPPFLAGS"
|
|
|
|
if test $valid_include != yes; then
|
|
@@ -5705,6 +5729,28 @@ else
|
|
fi
|
|
rm -f conftest*
|
|
|
|
+
|
|
+if test "x$DISABLE_OTP_TEST_ENGINE" = "xdefault"; then
|
|
+# Get default value for the --disable-otp-test-engine. Depends on cryptolib version
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+
|
|
+#include <openssl/opensslv.h>
|
|
+#if LIBRESSL_VERSION_NUMBER >= 0x3050000fL
|
|
+yes
|
|
+#endif
|
|
+
|
|
+_ACEOF
|
|
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
|
+ $EGREP "^yes.?$" >/dev/null 2>&1; then :
|
|
+ DISABLE_OTP_TEST_ENGINE=yes
|
|
+else
|
|
+ DISABLE_OTP_TEST_ENGINE=no
|
|
+fi
|
|
+rm -f conftest*
|
|
+
|
|
+ fi
|
|
+
|
|
CPPFLAGS="$save_CPPFLAGS"
|
|
|
|
if test $valid_include != yes; then
|