From e9a6e45556e66067f7359509a7866cdbb8fe3f29 Mon Sep 17 00:00:00 2001 From: Konstantin Demin Date: Mon, 3 Aug 2026 14:00:35 +0300 Subject: [PATCH] dropbear: bump to 2026.94 - update dropbear to latest stable 2026.94; for the changes see https://matt.ucc.asn.au/dropbear/CHANGES - server-side 2FA is no longer deprecated - remove previously cherry-picked patches - automatically refresh patches Signed-off-by: Konstantin Demin Link: https://github.com/openwrt/openwrt/pull/24363 Signed-off-by: Hauke Mehrtens --- package/network/services/dropbear/Makefile | 9 +++------ ...nds-read-matching-ecdsa-curve-identi.patch | 20 ------------------- .../dropbear/patches/110-change_user.patch | 2 +- 3 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 package/network/services/dropbear/patches/001-avoid-out-of-bounds-read-matching-ecdsa-curve-identi.patch diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile index 3d5123c35b..408dc8507e 100644 --- a/package/network/services/dropbear/Makefile +++ b/package/network/services/dropbear/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dropbear -PKG_VERSION:=2026.92 -PKG_RELEASE:=2 +PKG_VERSION:=2026.94 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ https://matt.ucc.asn.au/dropbear/releases/ \ https://dropbear.nl/mirror/releases/ -PKG_HASH:=91dcb5234de8dea68dd82c55411c9fc986b457ab58372a780ee8a870419c2f7e +PKG_HASH:=e098034a843699200c8c977a991fff73159735bf795d5f72ef672c41a6b1ae81 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE libtomcrypt/LICENSE libtommath/LICENSE @@ -118,15 +118,12 @@ CONFIGURE_ARGS += \ # - IDENT_VERSION_PART # disable unused functionality: # - DO_MOTD -# enable (deprecated) 2FA in server: -# - DEPRECATED_TWO_FACTOR DB_OPT_COMMON = \ IDENT_VERSION_PART,"" \ COMPAT_USER_SHELLS,"/bin/ash","/bin/sh" \ DEFAULT_PATH,"$(TARGET_INIT_PATH)" \ DEFAULT_ROOT_PATH,"$(TARGET_INIT_PATH)" \ - DEPRECATED_TWO_FACTOR,1 \ DO_MOTD,0 \ AUTH_TIMEOUT,$(CONFIG_DROPBEAR_AUTH_TIMEOUT) \ DEBUG_TRACE,$(CONFIG_DROPBEAR_DEBUG_TRACE) \ diff --git a/package/network/services/dropbear/patches/001-avoid-out-of-bounds-read-matching-ecdsa-curve-identi.patch b/package/network/services/dropbear/patches/001-avoid-out-of-bounds-read-matching-ecdsa-curve-identi.patch deleted file mode 100644 index 4dd2292bba..0000000000 --- a/package/network/services/dropbear/patches/001-avoid-out-of-bounds-read-matching-ecdsa-curve-identi.patch +++ /dev/null @@ -1,20 +0,0 @@ -From cfedf9889222e44b2a31ecc14a289b7d0d86c563 Mon Sep 17 00:00:00 2001 -From: basavaraj-sm05 -Date: Tue, 7 Jul 2026 13:05:32 +0530 -Subject: avoid out-of-bounds read matching ecdsa curve identifier - ---- - src/ecdsa.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/src/ecdsa.c -+++ b/src/ecdsa.c -@@ -103,7 +103,7 @@ ecc_key *buf_get_ecdsa_pub_key(buffer* b - } - - for (curve = dropbear_ecc_curves; *curve; curve++) { -- if (memcmp(identifier, (char*)(*curve)->name, strlen((char*)(*curve)->name)) == 0) { -+ if (strcmp((char*)identifier, (*curve)->name) == 0) { - break; - } - } diff --git a/package/network/services/dropbear/patches/110-change_user.patch b/package/network/services/dropbear/patches/110-change_user.patch index db85218070..edcdfa5096 100644 --- a/package/network/services/dropbear/patches/110-change_user.patch +++ b/package/network/services/dropbear/patches/110-change_user.patch @@ -12,7 +12,7 @@ dropbear_exit("Error changing user group"); } -@@ -528,7 +528,7 @@ void svr_switch_user(void) { +@@ -527,7 +527,7 @@ void svr_switch_user(void) { } #endif