From dae4481fecd14a6e6da64dd2c135966bb6582f53 Mon Sep 17 00:00:00 2001 From: Richard T Bonhomme Date: Sun, 22 Sep 2024 16:23:44 +0100 Subject: [PATCH 1/3] help: Add help for command 'renew' Signed-off-by: Richard T Bonhomme --- easyrsa3/easyrsa | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa index 28c2c21b..4704a04c 100755 --- a/easyrsa3/easyrsa +++ b/easyrsa3/easyrsa @@ -39,6 +39,7 @@ A list of commands is shown below: build-server-full [ cmd-opts ] build-serverClient-full [ cmd-opts ] inline + renew revoke [ cmd-opts ] expire revoke-expired [ cmd-opts ] @@ -239,6 +240,12 @@ Usage: easyrsa [ OPTIONS.. ] [ cmd-opts.. ]" to the 'pki/expired' directory. Allows an existing request to be signed again." + ;; + renew) + text=" +* renew + + Renew a certificate specified by " ;; gen-crl) text=" From 7379f307ecb97b9187533c53fdd975df9c7389f9 Mon Sep 17 00:00:00 2001 From: Richard T Bonhomme Date: Sun, 22 Sep 2024 16:31:26 +0100 Subject: [PATCH 2/3] renew: Remove unnecessary attempt to create new inline file Command 'renew' has inline files rebuilt when command 'sign-req' is called. Signed-off-by: Richard T Bonhomme --- dev/easyrsa-tools.lib | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/dev/easyrsa-tools.lib b/dev/easyrsa-tools.lib index 2fe216d0..ba3e2e37 100644 --- a/dev/easyrsa-tools.lib +++ b/dev/easyrsa-tools.lib @@ -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. From f2ad1575144f26b398bd97bb1edcd80933afe158 Mon Sep 17 00:00:00 2001 From: Richard T Bonhomme Date: Sun, 22 Sep 2024 16:46:06 +0100 Subject: [PATCH 3/3] Start temp-file counter at zero '0', not unset Signed-off-by: Richard T Bonhomme --- easyrsa3/easyrsa | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa index 4704a04c..f39f270e 100755 --- a/easyrsa3/easyrsa +++ b/easyrsa3/easyrsa @@ -5539,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 \ @@ -5553,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