From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 29 Jul 2022 08:27:35 +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 1oHJTD-003GAq-B9 for lore@lore.pengutronix.de; Fri, 29 Jul 2022 08:27:35 +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 1oHJTC-0002rn-Hc; Fri, 29 Jul 2022 08:27:34 +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 1oHJPP-00067B-CA; Fri, 29 Jul 2022 08:23:39 +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 1oHJPO-000SNw-LI; Fri, 29 Jul 2022 08:23:38 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oHJPN-00A2NY-Nc; Fri, 29 Jul 2022 08:23:37 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 29 Jul 2022 08:23:37 +0200 Message-Id: <20220729062337.2392381-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220704121831.23787-9-ada@thorsis.com> References: <20220704121831.23787-9-ada@thorsis.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] dropbear: Move option groups to sub menus 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 e14b8d56bcdf97accff3e3b1daac32fe1a865315. Michael [sent from post-receive hook] On Fri, 29 Jul 2022 08:23:37 +0200, Alexander Dahl wrote: > This was getting confusing and you had to scroll down. Sub menus also > make those requirements and warnings better visible. > > Signed-off-by: Alexander Dahl > Message-Id: <20220704121831.23787-9-ada@thorsis.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/dropbear.in b/rules/dropbear.in > index a3059c60502d..efc1c93fbc5f 100644 > --- a/rules/dropbear.in > +++ b/rules/dropbear.in > @@ -111,7 +111,7 @@ config DROPBEAR_DIS_PUTUTXLINE > help > pututxline is needed to write to the utmpx structure. > > -comment "features" > +menu "Features " > > config DROPBEAR_DIS_X11 > bool > @@ -136,7 +136,11 @@ config DROPBEAR_DIS_AGENT > Authentication agent is a program to automate the > use of authentication private keys. > > -comment "Encryption, at least one required --- RFC Draft requires 3DES and recommends AES128" > +endmenu > + > +menu "Encryption " > + > +comment "at least one required --- RFC Draft requires 3DES and recommends AES128" > > config DROPBEAR_AES128 > bool > @@ -199,7 +203,11 @@ config DROPBEAR_CTR_CIPHERS > CBC mode against certain attacks. This adds around 1kB to binary > size and is recommended for most cases. > > -comment "Message Integrity (HMAC), at least one required ---" > +endmenu > + > +menu "Message Integrity (HMAC) " > + > +comment "at least one required ---" > > config DROPBEAR_SHA1 > bool > @@ -254,7 +262,11 @@ config DROPBEAR_SHA512 > comment "WARNING: No Message Integrity method selected!" > depends on !DROPBEAR_SHA1 && !DROPBEAR_SHA1_96 && !DROPBEAR_SHA256 && !DROPBEAR_SHA512 > > -comment "Hostkey/public key algorithms, at least one required ---" > +endmenu > + > +menu "Hostkey/public key algorithms" > + > +comment "at least one required ---" > > config DROPBEAR_RSA > bool > @@ -288,7 +300,11 @@ config DROPBEAR_ED25519 > comment "WARNING: No Hostkey/public key algorithm selected!" > depends on !DROPBEAR_RSA && !DROPBEAR_ECDSA && !DROPBEAR_ED25519 > > -comment "Key exchange algorithm, at least one required ---" > +endmenu > + > +menu "Key exchange algorithm " > + > +comment "at least one required ---" > > config DROPBEAR_DH_GROUP14_SHA256 > bool > @@ -348,7 +364,11 @@ config DROPBEAR_DH_GROUP1 > comment "WARNING: No key exchange algorithm selected!" > depends on !DROPBEAR_DH_GROUP14_SHA256 && !DROPBEAR_DH_GROUP14_SHA1 && !DROPBEAR_DH_GROUP16 && !DROPBEAR_ECDH && !DROPBEAR_CURVE25519 && !DROPBEAR_DH_GROUP1 > > -comment "Authentication types, at least one required --- RFC Draft requires pubkey auth" > +endmenu > + > +menu "Authentication types " > + > +comment "at least one required --- RFC Draft requires pubkey auth" > > config DROPBEAR_PASSWD > bool > @@ -367,7 +387,9 @@ config DROPBEAR_PUBKEY > comment "WARNING: No authentication type selected!" > depends on !DROPBEAR_PASSWD && !DROPBEAR_PUBKEY > > -comment "installation options ---" > +endmenu > + > +comment "Installation options ---" > > config DROPBEAR_DROPBEAR > bool > @@ -403,7 +425,7 @@ config DROPBEAR_SCP > comment "OpenSSH scp is selected!" > depends on OPENSSH_SCP > > -comment "runtime options ---" > +comment "Runtime options ---" > > config DROPBEAR_STARTSCRIPT > bool