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 <rockdrilla@gmail.com> Link: https://github.com/openwrt/openwrt/pull/24363 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
parent
0903e882e1
commit
e9a6e45556
3 changed files with 4 additions and 27 deletions
|
|
@ -8,14 +8,14 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=dropbear
|
PKG_NAME:=dropbear
|
||||||
PKG_VERSION:=2026.92
|
PKG_VERSION:=2026.94
|
||||||
PKG_RELEASE:=2
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
||||||
PKG_SOURCE_URL:= \
|
PKG_SOURCE_URL:= \
|
||||||
https://matt.ucc.asn.au/dropbear/releases/ \
|
https://matt.ucc.asn.au/dropbear/releases/ \
|
||||||
https://dropbear.nl/mirror/releases/
|
https://dropbear.nl/mirror/releases/
|
||||||
PKG_HASH:=91dcb5234de8dea68dd82c55411c9fc986b457ab58372a780ee8a870419c2f7e
|
PKG_HASH:=e098034a843699200c8c977a991fff73159735bf795d5f72ef672c41a6b1ae81
|
||||||
|
|
||||||
PKG_LICENSE:=MIT
|
PKG_LICENSE:=MIT
|
||||||
PKG_LICENSE_FILES:=LICENSE libtomcrypt/LICENSE libtommath/LICENSE
|
PKG_LICENSE_FILES:=LICENSE libtomcrypt/LICENSE libtommath/LICENSE
|
||||||
|
|
@ -118,15 +118,12 @@ CONFIGURE_ARGS += \
|
||||||
# - IDENT_VERSION_PART
|
# - IDENT_VERSION_PART
|
||||||
# disable unused functionality:
|
# disable unused functionality:
|
||||||
# - DO_MOTD
|
# - DO_MOTD
|
||||||
# enable (deprecated) 2FA in server:
|
|
||||||
# - DEPRECATED_TWO_FACTOR
|
|
||||||
|
|
||||||
DB_OPT_COMMON = \
|
DB_OPT_COMMON = \
|
||||||
IDENT_VERSION_PART,"" \
|
IDENT_VERSION_PART,"" \
|
||||||
COMPAT_USER_SHELLS,"/bin/ash","/bin/sh" \
|
COMPAT_USER_SHELLS,"/bin/ash","/bin/sh" \
|
||||||
DEFAULT_PATH,"$(TARGET_INIT_PATH)" \
|
DEFAULT_PATH,"$(TARGET_INIT_PATH)" \
|
||||||
DEFAULT_ROOT_PATH,"$(TARGET_INIT_PATH)" \
|
DEFAULT_ROOT_PATH,"$(TARGET_INIT_PATH)" \
|
||||||
DEPRECATED_TWO_FACTOR,1 \
|
|
||||||
DO_MOTD,0 \
|
DO_MOTD,0 \
|
||||||
AUTH_TIMEOUT,$(CONFIG_DROPBEAR_AUTH_TIMEOUT) \
|
AUTH_TIMEOUT,$(CONFIG_DROPBEAR_AUTH_TIMEOUT) \
|
||||||
DEBUG_TRACE,$(CONFIG_DROPBEAR_DEBUG_TRACE) \
|
DEBUG_TRACE,$(CONFIG_DROPBEAR_DEBUG_TRACE) \
|
||||||
|
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
From cfedf9889222e44b2a31ecc14a289b7d0d86c563 Mon Sep 17 00:00:00 2001
|
|
||||||
From: basavaraj-sm05 <basavaraj@digiscrypt.com>
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
dropbear_exit("Error changing user group");
|
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
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue