From ada7bb41f60a68d11d6646e9e38d313e5f38b3d9 Mon Sep 17 00:00:00 2001 From: Richard T Bonhomme Date: Wed, 26 Oct 2022 23:22:16 +0100 Subject: [PATCH] Command 'renew': Remove option 'nopass' Command 'renew' no longer builds new keys, therefore, the option 'nopass' is not required. Closes: #740 Signed-off-by: Richard T Bonhomme --- easyrsa3/easyrsa | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa index 16a8515..cc7a07a 100755 --- a/easyrsa3/easyrsa +++ b/easyrsa3/easyrsa @@ -36,7 +36,7 @@ Here is the list of commands available with a short syntax reminder. Use the build-server-full [ cmd-opts ] build-serverClient-full [ cmd-opts ] revoke [cmd-opts] - renew [cmd-opts] + renew revoke-renewed [cmd-opts] rewind-renew rebuild [cmd-opts] @@ -185,12 +185,9 @@ cmd_help() { ;; renew) text=" -* renew [ cmd-opts ] +* renew Renew a certificate specified by " - - opts=" - * nopass - do not encrypt the private key (default is encrypted)" ;; rewind|rewind-renew) text=" @@ -2133,8 +2130,12 @@ Run easyrsa without commands for usage and command help." # Set 'nopass' unset -v opt_nopass case "$1" in - nopass) opt_nopass="$1"; shift ;; - '') : ;; # Empty ok + nopass) + warn "\ +Option 'nopass' is no longer supported by command 'renew'." + shift + ;; + '') :; shift ;; # Empty ok *) die "Unknown option: $1" esac @@ -2215,9 +2216,7 @@ These files will be moved to the 'renewed' storage sub-directory: These files will be DELETED: * All PKCS files for commonName : $file_name_base * The inline credentials file : $creds_in -* The duplicate certificate : $duplicate_crt_by_serial - -IMPORTANT: The new key will${opt_nopass+ NOT} be password protected." +* The duplicate certificate : $duplicate_crt_by_serial" confirm " Continue with renewal: " "yes" "\ Please confirm you wish to renew the certificate