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

Status: Use variable for ca.crt name and correct found_vars value

Browse Source 
'ca.crt' was hard-coded to 'pki/ca.crt', instead use '$EASYRSA_PKI/ca.crt'

Status incorrectly warns that there are multiple, conflicting vars files,
when vars is user-defined. Set '$found_vars' to 1, when vars is user-defined.

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

6
easyrsa3/easyrsa
View File

@ -74,9 +74,10 @@ Here is the list of commands available with a short syntax reminder. Use the
# CA Status
if verify_ca_init test; then
CA_cert="$EASYRSA_PKI/ca.crt"
CA_status=" CA status: OK
CA subject: \
$("$EASYRSA_OPENSSL" x509 -in pki/ca.crt -noout -subject)"
$("$EASYRSA_OPENSSL" x509 -in "$CA_cert" -noout -subject)"
else
CA_status=" CA status: CA has not been built."
fi
@ -5477,7 +5478,10 @@ EASYRSA_NO_VARS is enabled, not using a 'vars' file.${NL}"
elif [ "$EASYRSA_VARS_FILE" ]; then
if [ -e "$EASYRSA_VARS_FILE" ]; then
vars="$EASYRSA_VARS_FILE"
# User set vars turns off pki/var warning
user_vars_true=1
# Found exactly one vars file
found_vars=1
else
# If the --vars option does not point to a file
user_error "\