From: Alexander Dahl <ada@thorsis.com>
To: ptxdist@pengutronix.de
Cc: Ian Abbott <abbotti@mev.co.uk>, Bruno Thomsen <bruno.thomsen@gmail.com>
Subject: [ptxdist] [PATCH 8/8] dropbear: Move option groups to sub menus
Date: Mon, 4 Jul 2022 14:18:31 +0200 [thread overview]
Message-ID: <20220704121831.23787-9-ada@thorsis.com> (raw)
In-Reply-To: <20220704121831.23787-1-ada@thorsis.com>
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 <ada@thorsis.com>
---
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
next prev parent reply other threads:[~2022-07-04 12:19 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-04 12:18 [ptxdist] [PATCH 0/8] dropbear: version bump and option revise Alexander Dahl
2022-07-04 12:18 ` [ptxdist] [PATCH 1/8] dropbear: version bump 2020.81 -> 2022.82 Alexander Dahl
2022-07-08 15:13 ` Michael Olbrich
2022-07-21 7:10 ` [ptxdist] [PATCH] dropbear: Add patch to fix build with X11 forwarding Alexander Dahl
2022-08-04 15:14 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-07-29 6:23 ` [ptxdist] [APPLIED] dropbear: version bump 2020.81 -> 2022.82 Michael Olbrich
2022-07-04 12:18 ` [ptxdist] [PATCH 2/8] dropbear: Add ed25519 hostkey/public key support Alexander Dahl
2022-07-29 6:23 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-07-04 12:18 ` [ptxdist] [PATCH 3/8] dropbear: Remove curve25519 dependency Alexander Dahl
2022-07-29 6:23 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-07-04 12:18 ` [ptxdist] [PATCH 4/8] dropbear: Make Chacha20-Poly1305 encryption optional Alexander Dahl
2022-07-29 6:23 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-07-04 12:18 ` [ptxdist] [PATCH 5/8] dropbear: Append hints to some menu prompts Alexander Dahl
2022-07-29 6:23 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-07-04 12:18 ` [ptxdist] [PATCH 6/8] dropbear: Rework key exchange algorithm options Alexander Dahl
2022-07-04 12:31 ` Ian Abbott
2022-07-08 9:09 ` Michael Olbrich
2022-07-29 6:23 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-07-04 12:18 ` [ptxdist] [PATCH 7/8] dropbear: Add conditional comments with warnings Alexander Dahl
2022-07-29 6:23 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-07-04 12:18 ` Alexander Dahl [this message]
2022-07-29 6:23 ` [ptxdist] [APPLIED] dropbear: Move option groups to sub menus Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220704121831.23787-9-ada@thorsis.com \
--to=ada@thorsis.com \
--cc=abbotti@mev.co.uk \
--cc=bruno.thomsen@gmail.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox