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

Fold vars_source_check() back into verify_pki_init()

Browse Source 
vars_source_check() is ONLY used by verify_pki_init(),
remove the extra function.

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2022-04-08 21:32:12 +01:00
parent 324aa4e660
commit ccec36d3ea
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
easyrsa3/easyrsa
View File

@ -425,12 +425,6 @@ easyrsa_openssl() {
return $err return $err
} # => easyrsa_openssl } # => easyrsa_openssl
vars_source_check() {
# Check for defined EASYRSA_PKI
[ -n "$EASYRSA_PKI" ] || die "\
EASYRSA_PKI env-var undefined"
} # => vars_source_check()
# Verify supplied curve exists and generate curve file if needed # Verify supplied curve exists and generate curve file if needed
verify_curve_ec() { verify_curve_ec() {
if ! "$EASYRSA_OPENSSL" ecparam -name "$EASYRSA_CURVE" > /dev/null; then if ! "$EASYRSA_OPENSSL" ecparam -name "$EASYRSA_CURVE" > /dev/null; then
@ -493,8 +487,11 @@ Expected location: $EASYRSA_SSL_CONF"
verify_pki_init() { verify_pki_init() {
help_note="Run easyrsa without commands for usage and command help." help_note="Run easyrsa without commands for usage and command help."
# Check for defined EASYRSA_PKI
[ -n "$EASYRSA_PKI" ] || die "\
EASYRSA_PKI env-var undefined"
# check that the pki dir exists # check that the pki dir exists
vars_source_check
[ -d "$EASYRSA_PKI" ] || die "\ [ -d "$EASYRSA_PKI" ] || die "\
EASYRSA_PKI does not exist (perhaps you need to run init-pki)? EASYRSA_PKI does not exist (perhaps you need to run init-pki)?
Expected to find the EASYRSA_PKI at: $EASYRSA_PKI Expected to find the EASYRSA_PKI at: $EASYRSA_PKI