nik/easyrsa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Command 'renew': Remove option 'nopass'

Browse Source 
Command 'renew' no longer builds new keys, therefore, the option 'nopass'
is not required.

Closes: #740

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2022-10-26 23:22:16 +01:00
parent db33add56a
commit ada7bb41f6
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
easyrsa3/easyrsa
View File

@ -36,7 +36,7 @@ Here is the list of commands available with a short syntax reminder. Use the
build-server-full <file_name_base> [ cmd-opts ] build-server-full <file_name_base> [ cmd-opts ]
build-serverClient-full <file_name_base> [ cmd-opts ] build-serverClient-full <file_name_base> [ cmd-opts ]
revoke <file_name_base> [cmd-opts] revoke <file_name_base> [cmd-opts]
renew <file_name_base> [cmd-opts] renew <file_name_base>
revoke-renewed <file_name_base> [cmd-opts] revoke-renewed <file_name_base> [cmd-opts]
rewind-renew <certificate-serial-number> rewind-renew <certificate-serial-number>
rebuild <file_name_base> [cmd-opts] rebuild <file_name_base> [cmd-opts]
@ -185,12 +185,9 @@ cmd_help() {
;; ;;
renew) renew)
text=" text="
* renew <file_name_base> [ cmd-opts ] * renew <file_name_base>
Renew a certificate specified by <file_name_base>" Renew a certificate specified by <file_name_base>"
opts="
* nopass - do not encrypt the private key (default is encrypted)"
;; ;;
rewind|rewind-renew) rewind|rewind-renew)
text=" text="
@ -2133,8 +2130,12 @@ Run easyrsa without commands for usage and command help."
# Set 'nopass' # Set 'nopass'
unset -v opt_nopass unset -v opt_nopass
case "$1" in case "$1" in
nopass) opt_nopass="$1"; shift ;; nopass)
'') : ;; # Empty ok warn "\
Option 'nopass' is no longer supported by command 'renew'."
shift
;;
'') :; shift ;; # Empty ok
*) die "Unknown option: $1" *) die "Unknown option: $1"
esac esac
@ -2215,9 +2216,7 @@ These files will be moved to the 'renewed' storage sub-directory:
These files will be DELETED: These files will be DELETED:
* All PKCS files for commonName : $file_name_base * All PKCS files for commonName : $file_name_base
* The inline credentials file : $creds_in * The inline credentials file : $creds_in
* The duplicate certificate : $duplicate_crt_by_serial * The duplicate certificate : $duplicate_crt_by_serial"
IMPORTANT: The new key will${opt_nopass+ NOT} be password protected."
confirm " Continue with renewal: " "yes" "\ confirm " Continue with renewal: " "yes" "\
Please confirm you wish to renew the certificate Please confirm you wish to renew the certificate