From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 29 Jul 2022 08:26:45 +0200 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 1oHJSP-003G7t-1t for lore@lore.pengutronix.de; Fri, 29 Jul 2022 08:26:45 +0200 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 1oHJSJ-0001dn-8J; Fri, 29 Jul 2022 08:26:39 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oHJPK-000645-0n; Fri, 29 Jul 2022 08:23:34 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1oHJPJ-000SNc-A3; Fri, 29 Jul 2022 08:23:33 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oHJPI-00A2I5-JB; Fri, 29 Jul 2022 08:23:32 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 29 Jul 2022 08:23:32 +0200 Message-Id: <20220729062332.2392042-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220704121831.23787-5-ada@thorsis.com> References: <20220704121831.23787-5-ada@thorsis.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] dropbear: Make Chacha20-Poly1305 encryption optional 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: Alexander Dahl 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 Thanks, applied as cd3102b2cf895b8958855e93330417cc92b64454. Michael [sent from post-receive hook] On Fri, 29 Jul 2022 08:23:32 +0200, Alexander Dahl wrote: > Making this optional was basically for testing purposes, but might be > interesting for users who want to squeeze out the last few bytes. > The option is enabled by dropbear by default, so now it's possible to > disable it in ptxdist. > > Signed-off-by: Alexander Dahl > Message-Id: <20220704121831.23787-5-ada@thorsis.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/dropbear.in b/rules/dropbear.in > index 129e94cae4c8..25b92839b64e 100644 > --- a/rules/dropbear.in > +++ b/rules/dropbear.in > @@ -170,6 +170,16 @@ config DROPBEAR_AES256 > algorithm that may be used by U.S. Government organizations > (and others) to protect sensitive information. > > +config DROPBEAR_CHACHA20POLY1305 > + bool > + prompt "Chacha20-Poly1305" > + default y > + help > + Enable Chacha20-Poly1305 authenticated encryption mode. > + This is generally faster than AES256 on CPU w/o dedicated AES > + instructions, having the same key size. > + Recommended. > + > config DROPBEAR_CBC_CIPHERS > bool > prompt "CBC mode ciphers" > diff --git a/rules/dropbear.make b/rules/dropbear.make > index a5ff02c9e0a0..7653cf3e57cc 100644 > --- a/rules/dropbear.make > +++ b/rules/dropbear.make > @@ -127,6 +127,14 @@ else > @echo "#define DROPBEAR_AES256 0" >> $(DROPBEAR_LOCALOPTIONS) > endif > > +ifdef PTXCONF_DROPBEAR_CHACHA20POLY1305 > + @echo "ptxdist: enabling chacha20-poly1305" > + @echo "#define DROPBEAR_CHACHA20POLY1305 1" >> $(DROPBEAR_LOCALOPTIONS) > +else > + @echo "ptxdist: disabling chacha20-poly1305" > + @echo "#define DROPBEAR_CHACHA20POLY1305 0" >> $(DROPBEAR_LOCALOPTIONS) > +endif > + > # ciphers > ifdef PTXCONF_DROPBEAR_CBC_CIPHERS > @echo "ptxdist: enabling cbc ciphers"