From 23558ae81dda170111615acca339452f1363fcb8 Mon Sep 17 00:00:00 2001 From: Richard T Bonhomme Date: Thu, 16 Jun 2022 12:03:51 +0100 Subject: [PATCH] Re-instate subshell for build_full() -> sign_req() Subshell is required due to use of die() in sign_req(). Otherwise, on error sign_req() errors out without removing input files. Revert part of commit: 15429df9fdd5c63c6e33dba141ff2e9a77ed0855 Signed-off-by: Richard T Bonhomme --- easyrsa3/easyrsa | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa index b091b4f..a3c0ba6 100755 --- a/easyrsa3/easyrsa +++ b/easyrsa3/easyrsa @@ -1637,12 +1637,10 @@ Matching file found at: " gen_req "$name" batch ${nopass+ nopass} # Sign it - if sign_req "$crt_type" "$name" batch; then - : # ok - else - rm -f "$req_out" "$key_out" + ( sign_req "$crt_type" "$name" batch ) || { + rm -f "$crt_out" "$req_out" "$key_out" die "Failed to sign '$name' - See error messages above for details." - fi + } # inline it if [ "$EASYRSA_INLINE" ]; then