Skip to contentSkip to conversation

dropbear: Disable DSS correctly

PATCH In review [email protected] 2 participants 2 messages Jul 10 – Jul 23

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 dropbear: Disable DSS correctly

From: Mike Crowe <[email protected]>

Take upstream patch that stops sysoptions.h unconditionally turning DROPBEAR_DSS back on even when it has been disabled (which is the default).

---

 ...PBEAR_DSS-is-only-forced-for-fuzzing.patch | 30 +++++++++++++++++++
 .../recipes-core/dropbear/dropbear_2022.83.bb |  1 +
 2 files changed, 31 insertions(+)
 create mode 100644 meta/recipes-core/dropbear/dropbear/0001-Fix-so-DROPBEAR_DSS-is-only-forced-for-fuzzing.patch

Since v1 at https://lists.openembedded.org/g/openembedded-core/topic/120033783 :
Add Signed-off-by to patch file

meta/recipes-core/dropbear/dropbear/0001-Fix-so-DROPBEAR_DSS-is-only-forced-for-fuzzing.patch new file +30 -0
new file mode 100644
index 0000000000..250cbb7a6f
@@ -0,0 +1,30 @@
+From c7dfaebd5f6a4cde4198f4d2a7baabaa1f632274 Mon Sep 17 00:00:00 2001
+From: Matt Johnston <[email protected]>
+Date: Tue, 6 Dec 2022 22:34:11 +0800
+Subject: [PATCH] Fix so DROPBEAR_DSS is only forced for fuzzing
+
+Regression from 787391ea3b5af2acf5e3c83372510f0c79477ad7,
+was missing fuzzing conditional
+
+Upstream-Status: Backport [https://github.com/mkj/dropbear/commit/c043efb47c3173072fa636ca0da0d19875d4511f]
+Signed-off-by: Mike Crowe <[email protected]>
+---
+ sysoptions.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/sysoptions.h b/sysoptions.h
+index fb6adc7..12db59c 100644
+--- a/sysoptions.h
++++ b/sysoptions.h
+@@ -383,9 +383,11 @@
+ #endif
+ 
+ /* Fuzzing expects all key types to be enabled */
++#if DROPBEAR_FUZZ
+ #if defined(DROPBEAR_DSS)
+ #undef DROPBEAR_DSS
+ #endif
+ #define DROPBEAR_DSS 1
++#endif
+ 
+ /* no include guard for this file */
meta/recipes-core/dropbear/dropbear_2022.83.bb +1 -0
index 93563aa3b4..d203fee34b 100644
@@ -28,6 +28,7 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
            file://0001-Handle-arbitrary-length-paths-and-commands-in-multih.patch \
            file://0001-cli-runopts.c-add-missing-DROPBEAR_CLI_PUBKEY_AUTH.patch \
            file://0001-Avoid-unused-variable-with-DROPBEAR_CLI_PUBKEY_AUTH-.patch \
+           file://0001-Fix-so-DROPBEAR_DSS-is-only-forced-for-fuzzing.patch \
            file://CVE-2025-47203.patch \
            file://CVE-2019-6111.patch \
            "
Signature · 1 line
2.47.3
#1 lore raw
Quoted 9 lines · Mike Crowe via lists.openembedded.org

From: Mike Crowe <[email protected]>

Take upstream patch that stops sysoptions.h unconditionally turning DROPBEAR_DSS back on even when it has been disabled (which is the default).

---

Quoted 7 lines
 ...PBEAR_DSS-is-only-forced-for-fuzzing.patch | 30 +++++++++++++++++++
 .../recipes-core/dropbear/dropbear_2022.83.bb |  1 +
 2 files changed, 31 insertions(+)
 create mode 100644 meta/recipes-core/dropbear/dropbear/0001-Fix-so-DROPBEAR_DSS-is-only-forced-for-fuzzing.patch

Since v1 at https://lists.openembedded.org/g/openembedded-core/topic/120033783 :
Add Signed-off-by to patch file

Hello,

Following up on Paul's review:
https://lore.kernel.org/all/[email protected]/T/#m22cf49ca44c68152fdd48c027afafced0da03ffd

Ultimately, we can not accept this patch, sorry.
We can't change the default behavior and risk breaking existing configuration that uses DSS.

Regards,

Signature · 2 lines
Yoann Congal
Smile ECS