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 <[email protected]>
---
 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


Reply via email to