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

Merge branch 'TinCanTech-verify-ssl-before-temp-session'

Browse Source 
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2023-02-08 23:11:26 +00:00
commit fd8dcfdafe
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
easyrsa3/easyrsa
View File

@ -926,6 +926,9 @@ verify_ssl_lib() {
*) *)
error_msg="$("$EASYRSA_OPENSSL" version 2>&1)" error_msg="$("$EASYRSA_OPENSSL" version 2>&1)"
die "\ die "\
* OpenSSL must either exist in your PATH
or be defined in your vars file.
Invalid SSL output for 'version': Invalid SSL output for 'version':
$error_msg" $error_msg"
@ -4655,15 +4658,15 @@ Sourcing the vars file and building certificates will probably fail ..'
set_var EASYRSA_KDC_REALM "CHANGEME.EXAMPLE.COM" set_var EASYRSA_KDC_REALM "CHANGEME.EXAMPLE.COM"
# Verify SSL Lib - One time ONLY
verify_ssl_lib
# Find x509-types but do not fail - Not fatal here, used by 'help' # Find x509-types but do not fail - Not fatal here, used by 'help'
install_data_to_pki x509-types-only install_data_to_pki x509-types-only
# For commands which 'require a PKI' and the PKI exists # For commands which 'require a PKI' and the PKI exists
if [ "$pki_is_required" ] && [ -d "$EASYRSA_PKI" ]; then if [ "$pki_is_required" ] && [ -d "$EASYRSA_PKI" ]; then
# Verify SSL Lib - One time ONLY
verify_ssl_lib
# mkdir Temp dir session # mkdir Temp dir session
secure_session || die "Temporary directory secure-session failed." secure_session || die "Temporary directory secure-session failed."
@ -5329,7 +5332,7 @@ print_version()
EasyRSA Version Information EasyRSA Version Information
Version: $EASYRSA_version Version: $EASYRSA_version
Generated: ~DATE~ Generated: ~DATE~
SSL Lib: $ssl_version SSL Lib: ${ssl_version:-undefined}
Git Commit: ~GITHEAD~ Git Commit: ~GITHEAD~
Source Repo: https://github.com/OpenVPN/easy-rsa Source Repo: https://github.com/OpenVPN/easy-rsa
VERSION_TEXT VERSION_TEXT