From 575a964fe08f7efd7f3be7e49e11b11afccd966b Mon Sep 17 00:00:00 2001 From: Richard T Bonhomme Date: Sun, 30 Nov 2025 21:31:20 +0000 Subject: [PATCH 1/3] help: Add '-b' alias for --batch and correct default 'vars' file Signed-off-by: Richard T Bonhomme --- easyrsa3/easyrsa | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa index 447f7de76..20ae0c69a 100755 --- a/easyrsa3/easyrsa +++ b/easyrsa3/easyrsa @@ -22,7 +22,7 @@ Global options: --version : Prints EasyRSA version and build information --verbose|-v : Enable verbose output ---batch : Set automatic (no-prompts when possible) mode +--batch|-b : Set automatic (no-prompts when possible) mode --silent|-s : Disable all warnings, notices and information --sbatch : Combined --silent and --batch operating mode --silent-ssl|-S : Silence SSL output (Requires batch mode) @@ -33,11 +33,11 @@ Global options: --passout=ARG : Set -passout ARG for openssl (eg: pass:xEasyRSAy) --raw-ca : Build CA with password via RAW SSL input ---vars=FILE : Define a specific 'vars' file to use for Easy-RSA config - (Default vars file is in the current working directory) --pki=DIR : Declare the PKI directory (Default PKI directory is sub-directory 'pki') See Advanced.md for in depth usage. +--vars=FILE : Define a specific 'vars' file to use for Easy-RSA config + (Default vars file is in the current working PKI) --umask=ARG : Define a UMASK (Default 077) --no-umask : Do not use a UMASK, fall back to file system default. @@ -6851,7 +6851,7 @@ while :; do empty_ok=1 export EASYRSA_NS_COMMENT="$val" ;; - --batch) + -b|--batch) empty_ok=1 export EASYRSA_BATCH=1 ;; From 18ae7e76c9d36b13f0a176e7fde5894193f70990 Mon Sep 17 00:00:00 2001 From: Richard T Bonhomme Date: Tue, 2 Dec 2025 02:26:27 +0000 Subject: [PATCH 2/3] Minor improvements to help Signed-off-by: Richard T Bonhomme --- easyrsa3/easyrsa | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa index 20ae0c69a..683964b3a 100755 --- a/easyrsa3/easyrsa +++ b/easyrsa3/easyrsa @@ -24,14 +24,13 @@ Global options: --verbose|-v : Enable verbose output --batch|-b : Set automatic (no-prompts when possible) mode --silent|-s : Disable all warnings, notices and information ---sbatch : Combined --silent and --batch operating mode --silent-ssl|-S : Silence SSL output (Requires batch mode) --nopass|no-pass: Do not use passwords Can NOT be used with --passin or --passout --passin=ARG : Set -passin ARG for openssl (eg: pass:xEasyRSAy) --passout=ARG : Set -passout ARG for openssl (eg: pass:xEasyRSAy) ---raw-ca : Build CA with password via RAW SSL input +--rawca|raw-ca : Build CA with password via RAW SSL input --pki=DIR : Declare the PKI directory (Default PKI directory is sub-directory 'pki') @@ -129,8 +128,8 @@ Command list: expire renew-ca renew - revoke [ cmd-opts ] #(DEPRECATED) - revoke-issued [ cmd-opts ] #(REPLACEMENT) + revoke [ cmd-opts ] # DEPRECATED + revoke-issued [ cmd-opts ] # REPLACEMENT revoke-expired [ cmd-opts ] revoke-renewed [ cmd-opts ] gen-crl @@ -150,11 +149,11 @@ Command list: export-p12 [ cmd-opts ] set-pass [ cmd-opts ] gen-tls-auth-key / gen-tls-crypt-key - write + write serial|check-serial - display-dn
+ display-dn show-eku | - rand + rand " } # => usage() @@ -6962,7 +6961,7 @@ while :; do -*) user_error "\ Unknown option '$opt'. -Run 'easyrsa help options' for option help." +Run 'easyrsa help' for option help." ;; *) break @@ -7004,6 +7003,7 @@ fi # Set cmd now cmd="$1" [ "$1" ] && shift # scrape off command +fn_name="$cmd" # Hand off to the function responsible # ONLY verify_working_env() for valid commands From 4647c848b89d8809497d9022cd4a844bf528b28c Mon Sep 17 00:00:00 2001 From: Richard T Bonhomme Date: Tue, 2 Dec 2025 23:18:13 +0000 Subject: [PATCH 3/3] ChangeLog: Add '-b' alias for --batch Signed-off-by: Richard T Bonhomme --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 3823c39a0..2b628312e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Easy-RSA 3 ChangeLog 3.2.5 (TBD) + * Add '-b' alias for --batch (575a964) (#1411) * Introduce peer-fingerprint inline lists (94c3690) (#1410) * Create new inline file type 'pfp', peer-fingerprint (353adc5) (#1407) * export_pkcs(), PKCS12 inline: Respect $EASYRSA_NO_INLINE (35d7ad3) (#1407)