mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 16:31:13 +00:00
c21a4c7246
When libressl was linked the libpthread was missing, add it in addition.
Also make the mxsimage tool to use the OpenSSL 1.1 API for the recent
libressl version.
Fixes: 2c192b6916 ("tools/libressl: update to version 2.7.2")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
From c5b0bca4c3ca5c3d1d8ee99fdbf3b494a3986dbd Mon Sep 17 00:00:00 2001
|
|
From: Hauke Mehrtens <hauke@hauke-m.de>
|
|
Date: Sun, 18 Mar 2018 16:03:47 +0100
|
|
Subject: [PATCH] tools/mxsimage: Support building with LibreSSL
|
|
|
|
The mxsimage utility fails to compile against LibreSSL version < 2.7.0
|
|
because LibreSSL says it is OpenSSL 2.0, but it does not support the
|
|
complete OpenSSL 1.1 interface.
|
|
|
|
LibreSSL defines OPENSSL_VERSION_NUMBER with 0x20000000L and therefor
|
|
claims to have an API compatible with OpenSSL 2.0, but it implements
|
|
EVP_MD_CTX_new(), EVP_MD_CTX_free() and EVP_CIPHER_CTX_reset() only
|
|
starting with version 2.7.0, which is not yet released. OpenSSL
|
|
implements this function since version 1.1.0.
|
|
|
|
This commit will activate the compatibility code meant for
|
|
OpenSSL < 1.1.0 also for LibreSSL version < 2.7.0.
|
|
|
|
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|
Reviewed-by: Jonathan Gray <jsg@jsg.id.au>
|
|
---
|
|
tools/mxsimage.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
--- a/tools/mxsimage.c
|
|
+++ b/tools/mxsimage.c
|
|
@@ -26,7 +26,8 @@
|
|
* OpenSSL 1.1.0 and newer compatibility functions:
|
|
* https://wiki.openssl.org/index.php/1.1_API_Changes
|
|
*/
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
|
|
+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
|
|
static void *OPENSSL_zalloc(size_t num)
|
|
{
|
|
void *ret = OPENSSL_malloc(num);
|