From d837bd2583865ebb506206e30e1414893f54a7ad Mon Sep 17 00:00:00 2001
From: Russ Magee <rmagee+simplyembedded@gmail.com>
Date: Mon, 15 Nov 2021 17:57:01 -0800
Subject: [PATCH] xsd.initrc fix; help improvements

---
 xs/xs.go   | 30 +++++++++++++++++++++++++++---
 xsd.initrc |  4 ++--
 xsd/xsd.go |  6 +++---
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/xs/xs.go b/xs/xs.go
index 5a1ab51..b63c795 100755
--- a/xs/xs.go
+++ b/xs/xs.go
@@ -710,9 +710,33 @@ func main() {
 
 	flag.BoolVar(&vopt, "v", false, "show version")
 	flag.BoolVar(&dbg, "d", false, "debug logging")
-	flag.StringVar(&cipherAlg, "c", "C_AES_256", "session `cipher` [C_AES_256 | C_TWOFISH_128 | C_BLOWFISH_64 | C_CRYPTMT1 | C_CHACHA20_12 | C_HOPSCOTCH]")
-	flag.StringVar(&hmacAlg, "m", "H_SHA256", "session `HMAC` [H_SHA256 | H_SHA512]")
-	flag.StringVar(&kexAlg, "k", "KEX_HERRADURA512", "KEx `alg` [KEX_HERRADURA{256/512/1024/2048} | KEX_KYBER{512/768/1024} | KEX_NEWHOPE | KEX_NEWHOPE_SIMPLE | KEX_FRODOKEM_{1344|976}{AES|SHAKE}]")
+	flag.StringVar(&cipherAlg, "c", "C_AES_256", "session `cipher`"+`
+      C_all
+      C_AES_256
+      C_TWOFISH_128
+      C_BLOWFISH_64
+      C_CRYPTMT1
+      C_HOPSCOTCH
+      C_CHACHA20_12`)
+	flag.StringVar(&hmacAlg, "m", "H_SHA256", "session `HMAC`"+`
+      H_all
+      H_SHA256
+      H_SHA512`)
+	flag.StringVar(&kexAlg, "k", "KEX_HERRADURA512", "KEx `alg`"+`
+      KEX_all
+      KEX_HERRADURA256
+      KEX_HERRADURA512
+      KEX_HERRADURA1024
+      KEX_HERRADURA2048
+      KEX_KYBER512
+      KEX_KYBER768
+      KEX_KYBER1024
+      KEX_NEWHOPE
+      KEX_NEWHOPE_SIMPLE
+      KEX_FRODOKEM_1344AES
+      KEX_FRODOKEM_1344SHAKE
+      KEX_FRODOKEM_976AES
+      KEX_FRODOKEM_976SHAKE`)
 	flag.StringVar(&kcpMode, "K", "unused", "KCP `alg`, one of [KCP_NONE | KCP_AES | KCP_BLOWFISH | KCP_CAST5 | KCP_SM4 | KCP_SALSA20 | KCP_SIMPLEXOR | KCP_TEA | KCP_3DES | KCP_TWOFISH | KCP_XTEA] to use KCP (github.com/xtaci/kcp-go) reliable UDP instead of TCP")
 	flag.UintVar(&port, "p", 2000, "``port")
 	//flag.StringVar(&authCookie, "a", "", "auth cookie")
diff --git a/xsd.initrc b/xsd.initrc
index 955dbfd..b291ec6 100755
--- a/xsd.initrc
+++ b/xsd.initrc
@@ -6,7 +6,7 @@ XSD_USER=root
 XSD_HOME=/var/run
 INST_PREFIX=/usr/local
 COMMAND=$INST_PREFIX/sbin/xsd
-ARGS="-L"
+ARGS="-L -aK K_all -aC C_all -aH H_all"
 
 depend() {
     need net
@@ -28,7 +28,7 @@ start() {
         -d ${XSD_HOME} \
         --make-pidfile --pidfile ${XSD_PIDFILE} \
         --start --quiet --background \
-        --exec "${COMMAND}" -- "${ARGS}"
+        --exec "${COMMAND}" -- ${ARGS}
     eend $?
 }
 
diff --git a/xsd/xsd.go b/xsd/xsd.go
index 5b931c3..98e83eb 100755
--- a/xsd/xsd.go
+++ b/xsd/xsd.go
@@ -527,7 +527,7 @@ func main() {
 	flag.BoolVar(&useSystemPasswd, "s", true, "use system shadow passwds")
 	flag.BoolVar(&dbg, "d", false, "debug logging")
 
-	flag.Var(&aKEXAlgs, "aK", `Allowed KEX algs (eg. '-aK KEXAlgA -aK KEXAlgB ...') (default: none)
+	flag.Var(&aKEXAlgs, "aK", "Allowed KEX `alg`s (eg. '-aK KEXAlgA -aK KEXAlgB ...')" + `
       KEX_all
       KEX_HERRADURA256
       KEX_HERRADURA512
@@ -542,7 +542,7 @@ func main() {
       KEX_FRODOKEM_1344SHAKE
       KEX_FRODOKEM_976AES
       KEX_FRODOKEM_976SHAKE`)
-	flag.Var(&aCipherAlgs, "aC", `Allowed ciphers (eg. '-aC CAlgA -aC CAlgB ...') (default: none)
+	flag.Var(&aCipherAlgs, "aC", "Allowed `cipher`s (eg. '-aC CAlgA -aC CAlgB ...')" + `
       C_all
       C_AES_256
       C_TWOFISH_128
@@ -550,7 +550,7 @@ func main() {
       C_CRYPTMT1
       C_HOPSCOTCH
       C_CHACHA20_12`)
-	flag.Var(&aHMACAlgs, "aH", `Allowed HMACs (eg. '-aH HMACAlgA -aH HMACAlgB ...') (default: none)
+	flag.Var(&aHMACAlgs, "aH", "Allowed `HMAC`s (eg. '-aH HMACAlgA -aH HMACAlgB ...')" + `
       H_all
       H_SHA256
       H_SHA512`)