From 064ad45d35ba4fa8042d251c642c0f721ad0a2b2 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 18 Apr 2022 12:30:50 +0300 Subject: [PATCH] package/dropbear: bump to version 2022.82 Support for the Twofish algorithm is removed upstream. The dh_group1 algorithm is now disabled by default. Enable only when BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO is enabled. Signed-off-by: Baruch Siach Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/dropbear/dropbear.hash | 2 +- package/dropbear/dropbear.mk | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package/dropbear/dropbear.hash b/package/dropbear/dropbear.hash index 82ff454f0a..ff6e312fde 100644 --- a/package/dropbear/dropbear.hash +++ b/package/dropbear/dropbear.hash @@ -1,5 +1,5 @@ # From https://matt.ucc.asn.au/dropbear/releases/SHA256SUM.asc -sha256 48235d10b37775dbda59341ac0c4b239b82ad6318c31568b985730c788aac53b dropbear-2020.81.tar.bz2 +sha256 3a038d2bbc02bf28bbdd20c012091f741a3ec5cbe460691811d714876aad75d1 dropbear-2022.82.tar.bz2 # License file, locally computed sha256 a99ce657d790b761c132ee7e0de18edb437ae6361e536d991c6a12f36e770445 LICENSE diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index 1cbe63682c..bfb80345ec 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -4,7 +4,7 @@ # ################################################################################ -DROPBEAR_VERSION = 2020.81 +DROPBEAR_VERSION = 2022.82 DROPBEAR_SITE = https://matt.ucc.asn.au/dropbear/releases DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2 DROPBEAR_LICENSE = MIT, BSD-2-Clause, Public domain @@ -63,12 +63,12 @@ define DROPBEAR_ENABLE_LEGACY_CRYPTO echo '#define DROPBEAR_3DES 1' >> $(@D)/localoptions.h echo '#define DROPBEAR_ENABLE_CBC_MODE 1' >> $(@D)/localoptions.h echo '#define DROPBEAR_SHA1_96_HMAC 1' >> $(@D)/localoptions.h + echo '#define DROPBEAR_DH_GROUP1 1' >> $(@D)/localoptions.h endef DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_LEGACY_CRYPTO else define DROPBEAR_DISABLE_LEGACY_CRYPTO echo '#define DROPBEAR_DSS 0' >> $(@D)/localoptions.h - echo '#define DROPBEAR_DH_GROUP1 0' >> $(@D)/localoptions.h endef DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_DISABLE_LEGACY_CRYPTO endif @@ -87,8 +87,6 @@ DROPBEAR_CONF_OPTS += --disable-zlib --enable-bundled-libtom else define DROPBEAR_BUILD_FEATURED echo '#define DROPBEAR_SMALL_CODE 0' >> $(@D)/localoptions.h - echo '#define DROPBEAR_TWOFISH128 1' >> $(@D)/localoptions.h - echo '#define DROPBEAR_TWOFISH256 1' >> $(@D)/localoptions.h endef DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_FEATURED DROPBEAR_DEPENDENCIES += zlib libtomcrypt