From e4b02a1dcb694760da3859d97ba04d2504b1d314 Mon Sep 17 00:00:00 2001 From: Richard T Bonhomme Date: Sat, 17 Dec 2022 22:40:56 +0000 Subject: [PATCH] Function safe_set_var(): Hard exit for unexpected errors Signed-off-by: Richard T Bonhomme --- easyrsa3/easyrsa | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa index ef2f0af..17c05a1 100755 --- a/easyrsa3/easyrsa +++ b/easyrsa3/easyrsa @@ -3743,14 +3743,15 @@ db_date_to_ff_date() { # sanatize and set var safe_set_var() { - [ "$#" -eq 2 ] || return 1 + [ "$#" -eq 2 ] || die "safe_set_var - input" # check for simple errors case "$1" in - [1234567890]*|*-*|"* *") return 1 + [1234567890]*|*[-.\ ]*) + die "safe_set_var - var" esac - eval "$1"=1 || return 1 - unset -v "$1" || return 1 - set_var "$1" "$2" || return 1 + eval "$1"=1 || die "safe_set_var - eval" + unset -v "$1" || die "safe_set_var - unset" + set_var "$1" "$2" || die "safe_set_var - set_var" } # => safe_set_var() # get the serial number of the certificate -> serial=XXXX