Skip to content

Commit

Permalink
Merge branch 'bugfix-v321-01' of ssh://github.com/TinCanTech/easy-rsa…
Browse files Browse the repository at this point in the history
… into TinCanTech-bugfix-v321-01

Signed-off-by: Richard T Bonhomme <[email protected]>
  • Loading branch information
TinCanTech committed Sep 30, 2024
2 parents d059df3 + f2ad157 commit 736c9b1
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 14 deletions.
13 changes: 0 additions & 13 deletions dev/easyrsa-tools.lib
Original file line number Diff line number Diff line change
Expand Up @@ -856,19 +856,6 @@ The inline credentials files:
die "Renewal has failed to build a new certificate."
fi

# inline it
# Over write existing because renew is successful
if inline_creds "$file_name_base" > "$inline_in"
then
notice "\
Inline file created:
* $inline_in"
else
warn "\
INCOMPLETE Inline file created:
* $inline_in"
fi

# Success messages
notice "\
Renew was successful.
Expand Down
11 changes: 10 additions & 1 deletion easyrsa3/easyrsa
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ A list of commands is shown below:
build-server-full <file_name_base> [ cmd-opts ]
build-serverClient-full <file_name_base> [ cmd-opts ]
inline <file_name_base>
renew <file_name_base>
revoke <file_name_base> [ cmd-opts ]
expire <file_name_base>
revoke-expired <file_name_base> [ cmd-opts ]
Expand Down Expand Up @@ -239,6 +240,12 @@ Usage: easyrsa [ OPTIONS.. ] <COMMAND> <TARGET> [ cmd-opts.. ]"
to the 'pki/expired' directory.

Allows an existing request to be signed again."
;;
renew)
text="
* renew <file_name_base>

Renew a certificate specified by <file_name_base>"
;;
gen-crl)
text="
Expand Down Expand Up @@ -5532,7 +5539,7 @@ detect_host
unset -v \
OPENSSL_CONF \
verify_ssl_lib_ok ssl_batch \
secured_session mktemp_counter \
secured_session \
working_safe_ssl_conf working_safe_org_conf \
alias_days text \
prohibit_no_pass \
Expand All @@ -5546,6 +5553,8 @@ unset -v \
# Used by build-ca->cleanup to restore prompt
# after user interrupt when using manual password
prompt_restore=0
# Sequential temp-file counter
mktemp_counter=0

# Parse options
while :; do
Expand Down

0 comments on commit 736c9b1

Please sign in to comment.