From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 03 Jan 2023 10:50:34 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pCdwJ-000Hkj-C6 for lore@lore.pengutronix.de; Tue, 03 Jan 2023 10:50:34 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1pCdwH-0000zZ-Vy; Tue, 03 Jan 2023 10:50:33 +0100 Received: from mail.thorsis.com ([92.198.35.195]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pCdvb-0000zN-OQ for ptxdist@pengutronix.de; Tue, 03 Jan 2023 10:49:55 +0100 From: Alexander Dahl DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thorsis.com; s=default; t=1672739390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vZlk3uSSnBZrHOIGxPAHC6jruIgGnm+RZdDenwe3hE0=; b=eCFeVdxro2xovlCK4BwhIV2YHvrv72CkZkHIfMufWoTWmctRWF+5+6KZtDVhRhWZm2Fl6o 1bM98e8a09AIIWPD1oTF/R0RQc0GMl7NUV6P2h4NlVR51aUo54dART9slw5L1MxQU66Upq fU29Vmehpwstj91usQ965lqg5CGZJPE5IZe6amwAS7tIe+cid87mx6F5qvyafNB/O0wZM5 T2TbiHb8XKvDgPalDIIdtEgI6Kif+p1DR+KQPFF3uI6pYQYOlmavubyFYh4cVG5BwIAdaa F0vePv1h6/wu0NCvT2kO07VIiBpumxSKFuv31R5snooGrmm/8EpZJKc6bH9kJQ== To: ptxdist@pengutronix.de Date: Tue, 03 Jan 2023 10:49:34 +0100 Message-ID: <2319673.dNJyIzxMIQ@ada> In-Reply-To: References: Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Clacks-Overhead: GNU Terry Pratchett X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.8 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: Re: [ptxdist] [PATCH v2] dropbear: version bump 2022.82 -> 2022.83 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Ladislav Michl Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Hello, Am Montag, 2. Januar 2023, 18:25:23 CET schrieb Ladislav Michl: > From: Ladislav Michl > > Remove local patch which is already merged upstream. > DROPBEAR_SK_KEYS config option now replaces separate > DROPBEAR_SK_ECDSA and DROPBEAR_SK_ED25519 options, so > generate localoptions.h accordingly. > > Signed-off-by: Ladislav Michl > --- > CHANGES: > -v2: use DROPBEAR_SK_KEYS > > ...d-failure-use-DROPBEAR_PRIO_LOWDELAY.patch | 21 ------------------- > patches/dropbear-2022.82/series | 4 ---- > rules/dropbear.make | 7 +++---- > 3 files changed, 3 insertions(+), 29 deletions(-) > delete mode 100644 > patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDE > LAY.patch delete mode 100644 patches/dropbear-2022.82/series > > diff --git > a/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOW > DELAY.patch > b/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOW > DELAY.patch deleted file mode 100644 > index 8c46daf9c..000000000 > --- > a/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOW > DELAY.patch +++ /dev/null > @@ -1,21 +0,0 @@ > -From: Matt Johnston > -Date: Sat, 23 Apr 2022 22:33:31 +0800 > -Subject: [PATCH] Fix X11 build failure, use DROPBEAR_PRIO_LOWDELAY > - > ---- > - svr-x11fwd.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/svr-x11fwd.c b/svr-x11fwd.c > -index 353cb12e8dd1..5d9e6a96f577 100644 > ---- a/svr-x11fwd.c > -+++ b/svr-x11fwd.c > -@@ -206,7 +206,7 @@ void x11cleanup(struct ChanSess *chansess) { > - } > - > - static int x11_inithandler(struct Channel *channel) { > -- channel->prio = DROPBEAR_CHANNEL_PRIO_INTERACTIVE; > -+ channel->prio = DROPBEAR_PRIO_LOWDELAY; > - return 0; > - } > - > diff --git a/patches/dropbear-2022.82/series > b/patches/dropbear-2022.82/series deleted file mode 100644 > index 87840318b..000000000 > --- a/patches/dropbear-2022.82/series > +++ /dev/null > @@ -1,4 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch > -# dacc85cb839b0a9eec87bf2d3fc2463f - git-ptx-patches magic > diff --git a/rules/dropbear.make b/rules/dropbear.make > index e86b8bf43..dfdbe572d 100644 > --- a/rules/dropbear.make > +++ b/rules/dropbear.make > @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_DROPBEAR) += dropbear > # > # Paths and names > # > -DROPBEAR_VERSION := 2022.82 > -DROPBEAR_MD5 := 7a4a5f2c6d23ff2e6627c97d7c1aeceb > +DROPBEAR_VERSION := 2022.83 > +DROPBEAR_MD5 := a75a34bcc03cacf71a2db9da3b7c94a5 > DROPBEAR := dropbear-$(DROPBEAR_VERSION) > DROPBEAR_SUFFIX := tar.bz2 > DROPBEAR_URL := > https://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).$(DROPBEAR_SUFFIX) @@ > -215,8 +215,7 @@ else > endif > > @echo "ptxdist: disabling u2f security key support" > - @echo "#define DROPBEAR_SK_ECDSA 0" >> $(DROPBEAR_LOCALOPTIONS) > - @echo "#define DROPBEAR_SK_ED25519 0" >> $(DROPBEAR_LOCALOPTIONS) > + @echo "#define DROPBEAR_SK_KEYS 0" >> $(DROPBEAR_LOCALOPTIONS) > > # key exchange algorithm > ifdef PTXCONF_DROPBEAR_DH_GROUP14_SHA256 Tested-by: Alexander Dahl Greets