From 3cb322049a3e7929e5933d3fd344c41ed13561f3 Mon Sep 17 00:00:00 2001
From: Richard T Bonhomme <tincantech@protonmail.com>
Date: Sun, 20 Nov 2022 20:54:52 +0000
Subject: [PATCH] cleanup(): Exit correctly for SIGINT

Also, replace $die_error_exit with $confirm_aborted:
Make die() the default exit on error.

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
---
 easyrsa3/easyrsa | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa
index 20321dc..c028cd5 100755
--- a/easyrsa3/easyrsa
+++ b/easyrsa3/easyrsa
@@ -531,7 +531,6 @@ Easy-RSA error:
 
 $1
 " 1>&2
-	die_error_exit=1
 	exit "${2:-1}"
 } # => die()
 
@@ -588,6 +587,7 @@ Type the word '$value' to continue, or any other input to abort."
 	read input
 	printf '\n'
 	[ "$input" = "$value" ] && return
+	confirm_aborted=1
 	notice "Aborting without confirmation."
 	exit 9
 } # => confirm()
@@ -742,10 +742,13 @@ Temporary session not preserved."
 	elif [ "$1" = ok ]; then
 		# if there is no error then 'cleanup ok' is called
 		exit 0
+	elif [ "$1" = 2 ]; then
+		# SIGINT
+		kill -2 "$$"
 	else
 		# if 'cleanup' is called without 'ok' then an error occurred
 		# Do not show_host() for confirm() aborted exit
-		[ "$die_error_exit" ] && show_host
+		[ "$confirm_aborted" ] || show_host
 		exit 1
 	fi
 } # => cleanup()
@@ -4964,7 +4967,7 @@ NL='
 [ "$EASYRSA_NO_UMASK" ] || umask "${EASYRSA_UMASK:-077}"
 
 # Register cleanup on EXIT
-trap "cleanup" EXIT
+trap 'cleanup $?' EXIT
 # When SIGHUP, SIGINT, SIGQUIT, SIGABRT and SIGTERM,
 # explicitly exit to signal EXIT (non-bash shells)
 trap "exit 1" 1
@@ -4977,7 +4980,7 @@ trap "exit 14" 15
 detect_host
 
 # Initialisation requirements
-unset -v die_error_exit easyrsa_error_exit \
+unset -v confirm_aborted easyrsa_error_exit \
 	user_san_true user_vars_true alias_days
 
 # Parse options