mirror of
https://git.yoctoproject.org/meta-security
synced 2026-10-23 07:48:12 +00:00
ncrack: fix OpenSSL 4.0 breakage
Apply patch from outstanding upstream PR to fix building with OpenSSL 4.0. Signed-off-by: Scott Murray <scott.murray@konsulko.com>
This commit is contained in:
1 parent
0339b65f63
commit
4ca185ea19
2 files changed
+56
-1
No files matched your search
@@ -0,0 +1,53 @@
|
|||||||
|
From 76a0eabaad402ed935c1294f98663cf58a806a06 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ujjwal Sarswat <ujjwal.sarswat@canonical.com>
|
||||||
|
Date: Tue, 28 Jul 2026 07:54:33 +0530
|
||||||
|
Subject: [PATCH] fix: ftbfs with OpenSSL 4
|
||||||
|
|
||||||
|
Upstream-Status: Pending [https://github.com/nmap/ncrack/pull/147]
|
||||||
|
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
|
||||||
|
---
|
||||||
|
opensshlib/cipher-3des1.c | 4 ++++
|
||||||
|
opensshlib/cipher-bf1.c | 4 ++--
|
||||||
|
2 files changed, 6 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/opensshlib/cipher-3des1.c b/opensshlib/cipher-3des1.c
|
||||||
|
index 790faa2..30bd6bb 100644
|
||||||
|
--- a/opensshlib/cipher-3des1.c
|
||||||
|
+++ b/opensshlib/cipher-3des1.c
|
||||||
|
@@ -26,6 +26,8 @@
|
||||||
|
|
||||||
|
#include "ssherr.h"
|
||||||
|
|
||||||
|
+#ifdef WITH_SSH1
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* This is used by SSH1:
|
||||||
|
*
|
||||||
|
@@ -155,3 +157,5 @@ evp_ssh1_3des(void)
|
||||||
|
EVP_CIPHER_meth_set_flags(ssh1_3des, EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH);
|
||||||
|
return ssh1_3des;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+#endif /* WITH_SSH1 */
|
||||||
|
diff --git a/opensshlib/cipher-bf1.c b/opensshlib/cipher-bf1.c
|
||||||
|
index 8e3aac3..97c7de6 100644
|
||||||
|
--- a/opensshlib/cipher-bf1.c
|
||||||
|
+++ b/opensshlib/cipher-bf1.c
|
||||||
|
@@ -20,7 +20,7 @@
|
||||||
|
|
||||||
|
#include "includes.h"
|
||||||
|
|
||||||
|
-#ifdef WITH_OPENSSL
|
||||||
|
+#if defined(WITH_OPENSSL) && defined(WITH_SSH1)
|
||||||
|
|
||||||
|
#include <sys/types.h>
|
||||||
|
|
||||||
|
@@ -99,4 +99,4 @@ evp_ssh1_bf(void)
|
||||||
|
EVP_CIPHER_meth_set_do_cipher(ssh1_bf, bf_ssh1_do_cipher);
|
||||||
|
return (ssh1_bf);
|
||||||
|
}
|
||||||
|
-#endif /* WITH_OPENSSL */
|
||||||
|
+#endif /* WITH_OPENSSL && WITH_SSH1 */
|
||||||
|
--
|
||||||
|
2.47.3
|
||||||
|
|
||||||
@@ -8,7 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=7;endline=12;md5=8df67d60bde9d6c7b7
|
|||||||
|
|
||||||
DEPENDS = "openssl zlib"
|
DEPENDS = "openssl zlib"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/nmap/ncrack.git;branch=master;protocol=https"
|
SRC_URI = "git://github.com/nmap/ncrack.git;branch=master;protocol=https \
|
||||||
|
file://0001-fix-ftbfs-with-OpenSSL-4.patch \
|
||||||
|
"
|
||||||
SRCREV = "7fab46addcb99326cbf60f41dbde22a1e87aebad"
|
SRCREV = "7fab46addcb99326cbf60f41dbde22a1e87aebad"
|
||||||
|
|
||||||
PV = "0.7+git"
|
PV = "0.7+git"
|
||||||
|
|||||||
Reference in new issue
Block a user