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

init-pki: Change notice for x509-types directory to verbose level

Browse Source 
Now that easyrsa covers missing x509-types, the 'init-pki' message,
for the status of x509-types, is no longer required.

Improve and correct other messages and comments.

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2023-07-26 21:51:47 +01:00
parent ada4ccae1b
commit 669ee43ea1
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
easyrsa3/easyrsa
View File

@ -1368,9 +1368,8 @@ IMPORTANT:
else else
prefer_vars_in_pki_msg prefer_vars_in_pki_msg
fi fi
information " verbose "\
Using x509-types directory: init_pki: x509-types dir ${EASYRSA_EXT_DIR:-Not found}"
* ${EASYRSA_EXT_DIR:-Not found}"
} # => init_pki() } # => init_pki()
# Must be used in two places, so made it a function # Must be used in two places, so made it a function
@ -1468,6 +1467,16 @@ install_data_to_pki: $context - COMPLETED"
return return
fi fi
# Always require a pki/vars.example file
if [ -e "$EASYRSA_PKI/vars.example" ];then
: # ok
else
create_vars_example > "$EASYRSA_PKI/vars.example" || \
die "install_data_to_pki - create_vars_example FAILED"
verbose "\
install_data_to_pki: $context - create_vars_example OK"
fi
# Create PKI/vars from PKI/example # Create PKI/vars from PKI/example
unset -v new_vars_true unset -v new_vars_true
if [ "$found_vars" = 1 ] || [ "$user_vars_true" ] || \ if [ "$found_vars" = 1 ] || [ "$user_vars_true" ] || \
@ -1524,7 +1533,7 @@ install_data_to_pki: $context - create_openssl_easyrsa_cnf OK"
fi fi
[ -d "$EASYRSA_EXT_DIR" ] || verbose "\ [ -d "$EASYRSA_EXT_DIR" ] || verbose "\
install_data_to_pki - Missing: '$x509_types_dir'" install_data_to_pki: $context - Missing: '$x509_types_dir'"
verbose "install_data_to_pki: $context - COMPLETED" verbose "install_data_to_pki: $context - COMPLETED"
} # => install_data_to_pki () } # => install_data_to_pki ()
@ -3903,7 +3912,7 @@ Missing User Certificate, expected at:
p1) p1)
pkcs_out="$EASYRSA_PKI/private/$file_name_base.p1" pkcs_out="$EASYRSA_PKI/private/$file_name_base.p1"
# OpenSSLv3 requires -legacy for PKCS#1 # OpenSSLv3 requires -traditional for PKCS#1
# Otherwise, OpenSSLv3 outputs PKCS#8 # Otherwise, OpenSSLv3 outputs PKCS#8
[ "$verify_ssl_lib_ok" ] || \ [ "$verify_ssl_lib_ok" ] || \
die "export_pkcs.p1: verify_ssl_lib_ok FAIL" die "export_pkcs.p1: verify_ssl_lib_ok FAIL"