nik/easyrsa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build-ca: Error-exit on failure to write temp-CA-passphrase files

Browse Source 
Also, prototype easyrsa_mktemp() errors.

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2022-12-13 00:02:28 +00:00
parent 9a495f7bd3
commit 0ce126a289
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
easyrsa3/easyrsa
View File

@ -1371,9 +1371,9 @@ Please update openssl-easyrsa.cnf to the latest official release."
else
# Assign passphrase vars and temp file
in_key_pass_tmp="$(easyrsa_mktemp)" || \
die "Failed to create temporary file"
die "in_key_pass_tmp: create"
out_key_pass_tmp="$(easyrsa_mktemp)" || \
die "Failed to create temporary file"
die "out_key_pass_tmp: create"
# Dirty way to unit-test default behavior
if [ "$ERSA_UTEST_VERSION" ]; then
@ -1398,8 +1398,10 @@ Please update openssl-easyrsa.cnf to the latest official release."
# Validate passphrase
if [ "$p" ] && [ "$p" = "$q" ]; then
printf "%s" "$p" > "$in_key_pass_tmp"
printf "%s" "$p" > "$out_key_pass_tmp"
printf "%s" "$p" > "$in_key_pass_tmp" || \
die "in_key_pass_tmp: write"
printf "%s" "$p" > "$out_key_pass_tmp" || \
die "out_key_pass_tmp: write"
unset -v p q
else
die "Passphrases do not match!"
@ -1414,7 +1416,7 @@ Please update openssl-easyrsa.cnf to the latest official release."
{print}
}'
conf_tmp="$(easyrsa_mktemp)" || die "Failed to create temporary file"
conf_tmp="$(easyrsa_mktemp)" || die "conf_tmp: create"
{
cat "$EASYRSA_EXT_DIR/ca" "$EASYRSA_EXT_DIR/COMMON"
[ "$EASYRSA_EXTRA_EXTS" ] && print "$EASYRSA_EXTRA_EXTS"
@ -1475,7 +1477,7 @@ Please update openssl-easyrsa.cnf to the latest official release."
${EASYRSA_PASSOUT:+ -passout "$EASYRSA_PASSOUT"} \
${in_key_pass_tmp:+ -passin file:"$in_key_pass_tmp"} \
${out_key_pass_tmp:+ -passout file:"$out_key_pass_tmp"} \
|| die "Failed to build the CA"
|| die "Failed to build the CA certificate"
;;
*) die "build-ca ssl lib: $osslv_major"
esac