NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/nmap: fix build with libressl >= 3.5.0

Browse Source 
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 796ebbcf34)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine 2023-10-12 18:36:22 +02:00 committed by Peter Korsgaard
parent 1a91b6a044
commit 3d2cffe1a2
1 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
package/nmap/0002-nping-Crypto.cc-fix-build-with-libressl-3.5.0.patch Normal file
View File

@ -0,0 +1,39 @@
From 4ebea5c1d1a10be0d0165da3b9c0e1fa82c3db3c Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sat, 21 May 2022 17:51:37 +0200
Subject: [PATCH] nping/Crypto.cc: fix build with libressl >= 3.5.0
Fix the following build failure with libressl >= 3.5.0:
Crypto.cc: In static member function 'static int Crypto::aes128_cbc_encrypt(u8*, size_t, u8*, u8*, size_t, u8*)':
Crypto.cc:139:26: error: aggregate 'EVP_CIPHER_CTX ctx' has incomplete type and cannot be defined
139 | EVP_CIPHER_CTX ctx;
| ^~~
Fixes:
- http://autobuild.buildroot.org/results/2e6eebbe2ed8305b88047bc92c19350c1ecada16
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Upstream: https://github.com/nmap/nmap/pull/2480
---
nping/Crypto.cc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/nping/Crypto.cc b/nping/Crypto.cc
index 850438352..9f7c88686 100644
--- a/nping/Crypto.cc
+++ b/nping/Crypto.cc
@@ -70,7 +70,9 @@
#include <openssl/evp.h>
#include <openssl/err.h>
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined LIBRESSL_VERSION_NUMBER
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \
+ ((!defined LIBRESSL_VERSION_NUMBER) || \
+ (defined LIBRESSL_VERSION_NUMBER && LIBRESSL_VERSION_NUMBER >= 0x30500000L))
#define HAVE_OPAQUE_EVP_PKEY 1
#define FUNC_EVP_MD_CTX_init EVP_MD_CTX_reset
#define FUNC_EVP_MD_CTX_cleanup EVP_MD_CTX_reset
--
2.35.1