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

Rename 'conf_tmp' temp-file to 'raw_ssl_cnf_tmp'

Browse Source 
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2023-07-17 17:56:33 +01:00
parent 1f65bb2386
commit 2dd1077a10
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
easyrsa3/easyrsa
View File

@ -1786,9 +1786,9 @@ Raw CA mode
fi fi
# Assign tmp-file for config # Assign tmp-file for config
conf_tmp="" raw_ssl_cnf_tmp=""
easyrsa_mktemp conf_tmp || \ easyrsa_mktemp raw_ssl_cnf_tmp || \
die "build_ca - easyrsa_mktemp conf_tmp" die "build_ca - easyrsa_mktemp raw_ssl_cnf_tmp"
# Assign awkscript to insert EASYRSA_EXTRA_EXTS # Assign awkscript to insert EASYRSA_EXTRA_EXTS
# shellcheck disable=SC2016 # vars don't expand in '' # shellcheck disable=SC2016 # vars don't expand in ''
@ -1819,12 +1819,12 @@ Raw CA mode
print "$EASYRSA_EXTRA_EXTS" print "$EASYRSA_EXTRA_EXTS"
} | awk "$awkscript" "$EASYRSA_SSL_CONF" \ } | awk "$awkscript" "$EASYRSA_SSL_CONF" \
> "$conf_tmp" || \ > "$raw_ssl_cnf_tmp" || \
die "Copying X509_TYPES to config file failed" die "Copying X509_TYPES to config file failed"
verbose "build-ca: insert x509 and extensions OK" verbose "build-ca: insert x509 and extensions OK"
# Use this new SSL config for the rest of this function # Use this new SSL config for the rest of this function
EASYRSA_SSL_CONF="$conf_tmp" EASYRSA_SSL_CONF="$raw_ssl_cnf_tmp"
# Generate CA Key # Generate CA Key
if [ "$EASYRSA_RAW_CA" ]; then if [ "$EASYRSA_RAW_CA" ]; then
@ -2100,18 +2100,18 @@ $EASYRSA_EXTRA_EXTS"
{print} {print}
}' }'
# Assign temp-file for confg # Assign temp-file for confg
conf_tmp="" raw_ssl_cnf_tmp=""
easyrsa_mktemp conf_tmp || \ easyrsa_mktemp raw_ssl_cnf_tmp || \
die "gen_req - easyrsa_mktemp conf_tmp" die "gen_req - easyrsa_mktemp raw_ssl_cnf_tmp"
# Insert $extra_exts @ %EXTRA_EXTS% in SSL Config # Insert $extra_exts @ %EXTRA_EXTS% in SSL Config
print "$extra_exts" | \ print "$extra_exts" | \
awk "$awkscript" "$EASYRSA_SSL_CONF" \ awk "$awkscript" "$EASYRSA_SSL_CONF" \
> "$conf_tmp" || \ > "$raw_ssl_cnf_tmp" || \
die "Writing SSL config to temp file failed" die "Writing SSL config to temp file failed"
# Use this SSL config for the rest of this function # Use this SSL config for the rest of this function
EASYRSA_SSL_CONF="$conf_tmp" EASYRSA_SSL_CONF="$raw_ssl_cnf_tmp"
fi fi
# Name temp files # Name temp files
@ -2272,17 +2272,17 @@ to the latest Easy-RSA release."
{print} {print}
}' }'
# Assign temp-file for confg # Assign temp-file for confg
conf_tmp="" raw_ssl_cnf_tmp=""
easyrsa_mktemp conf_tmp || \ easyrsa_mktemp raw_ssl_cnf_tmp || \
die "sign_req - easyrsa_mktemp conf_tmp" die "sign_req - easyrsa_mktemp raw_ssl_cnf_tmp"
print "$copy_exts" | \ print "$copy_exts" | \
awk "$awkscript" "$EASYRSA_SSL_CONF" \ awk "$awkscript" "$EASYRSA_SSL_CONF" \
> "$conf_tmp" || die "\ > "$raw_ssl_cnf_tmp" || die "\
Writing 'copy_exts' to SSL config temp-file failed" Writing 'copy_exts' to SSL config temp-file failed"
# Use this SSL config for the rest of this function # Use this SSL config for the rest of this function
EASYRSA_SSL_CONF="$conf_tmp" EASYRSA_SSL_CONF="$raw_ssl_cnf_tmp"
verbose "sign_req: Using '$copy_exts'" verbose "sign_req: Using '$copy_exts'"
fi fi