Skip to content

Commit

Permalink
Remove 'upgrade' command interface and help only
Browse files Browse the repository at this point in the history
Signed-off-by: Richard T Bonhomme <[email protected]>
  • Loading branch information
TinCanTech committed Dec 7, 2023
1 parent ed0dc46 commit 360e9ff
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 18 deletions.
1 change: 1 addition & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Easy-RSA 3 ChangeLog

3.2.0 (TBD)
* Remove command 'upgrade' (#1045)'
* Remove EASYRSA_NO_VARS; Allow graceful use without a vars file (#1043)
* New diagnostic command 'display-cn' (#1040)
* Expand renewable certificate types to include code-signing (#1039)
Expand Down
20 changes: 2 additions & 18 deletions easyrsa3/easyrsa
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ A list of commands is shown below:
export-p7 <file_name_base> [ cmd-opts ]
export-p8 <file_name_base> [ cmd-opts ]
export-p12 <file_name_base> [ cmd-opts ]
set-pass <file_name_base> [ cmd-opts ]
upgrade <type>"
set-pass <file_name_base> [ cmd-opts ]"

# collect/show dir status:
text_only=1
Expand Down Expand Up @@ -404,17 +403,6 @@ cmd_help() {
* nopass - Do not encrypt the private key (Default: encrypted)
(Equivalent to global option '--nopass|--no-pass')
* file - (Advanced) Treat the file as a raw path, not a short-name"
;;
upgrade)
text="
* upgrade <type>

Upgrade EasyRSA PKI and/or CA.

Upgrade <type> must be one of:

* pki - Upgrade EasyRSA v2.x PKI to v3.x PKI (includes CA below)
* ca - Upgrade EasyRSA v3.0.5 CA or older to v3.0.6 CA or later."
;;
altname|subjectaltname|san)
text_only=1
Expand Down Expand Up @@ -7153,7 +7141,7 @@ cmd="$1"
# Establish PKI and CA initialisation requirements
# This avoids unnecessary warnings and notices
case "$cmd" in
''|help|-h|--help|--usage|version|upgrade|show-host)
''|help|-h|--help|--usage|version|show-host)
unset -v require_pki require_ca
ignore_vars=1
;;
Expand Down Expand Up @@ -7388,10 +7376,6 @@ case "$cmd" in
ssl_cert_x509v3_eku "$@" || \
easyrsa_exit_with_error=1
;;
upgrade)
verify_working_env
up23_manage_upgrade_23 "$@"
;;
""|help|-h|--help|--usage)
verify_working_env
cmd_help "$1"
Expand Down

0 comments on commit 360e9ff

Please sign in to comment.