From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 04 Jul 2022 14:19: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 1o8L36-005XUl-8F for lore@lore.pengutronix.de; Mon, 04 Jul 2022 14:19: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 1o8L38-000409-FC; Mon, 04 Jul 2022 14:19:34 +0200 Received: from mail.thorsis.com ([92.198.35.195]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1o8L28-0002vv-VA for ptxdist@pengutronix.de; Mon, 04 Jul 2022 14:18:34 +0200 Received: from adahl by ada.ifak-system.com with local (Exim 4.92) (envelope-from ) id 1o8L27-0006Cn-C1; Mon, 04 Jul 2022 14:18:31 +0200 From: Alexander Dahl To: ptxdist@pengutronix.de Date: Mon, 4 Jul 2022 14:18:31 +0200 Message-Id: <20220704121831.23787-9-ada@thorsis.com> In-Reply-To: <20220704121831.23787-1-ada@thorsis.com> References: <20220704121831.23787-1-ada@thorsis.com> Content-Transfer-Encoding: 8bit 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.6 required=4.0 tests=AWL,BAYES_00,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH 8/8] 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: Ian Abbott , Bruno Thomsen 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 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 --- rules/dropbear.in | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/rules/dropbear.in b/rules/dropbear.in index 4f6a6a906..29ab17dc6 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 @@ -135,7 +135,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 @@ -198,7 +202,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 @@ -253,7 +261,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 @@ -287,7 +299,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 @@ -347,7 +363,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 @@ -366,7 +386,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 @@ -402,7 +424,7 @@ config DROPBEAR_SCP comment "OpenSSH scp is selected!" depends on OPENSSH_SCP -comment "runtime options ---" +comment "Runtime options ---" config DROPBEAR_STARTSCRIPT bool -- 2.30.2