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

libressl: switch to using safessl-easyrsa.cnf

Browse Source 
Keep openssl-easyrsa.cnf but switch to using safessl-easyrsa.cnf
Has the benefit of fixing easyrsa3 openssl version check for libressl
This commit is contained in:
Richard Bonhomme 2018-08-23 20:22:43 +01:00
parent b647256313
commit 6c171b7882
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
easyrsa3/easyrsa
View File

@ -1162,7 +1162,9 @@ Note: using Easy-RSA configuration from: $vars"
# Detect openssl config, preferring EASYRSA_PKI over EASYRSA # Detect openssl config, preferring EASYRSA_PKI over EASYRSA
if [ -f "$EASYRSA_PKI/openssl-easyrsa.cnf" ]; then if [ -f "$EASYRSA_PKI/openssl-easyrsa.cnf" ]; then
set_var EASYRSA_SSL_CONF "$EASYRSA_PKI/openssl-easyrsa.cnf" set_var EASYRSA_SSL_CONF "$EASYRSA_PKI/openssl-easyrsa.cnf"
set_var EASYRSA_SAFE_CONF "$EASYRSA_PKI/safessl-easyrsa.cnf"
else set_var EASYRSA_SSL_CONF "$EASYRSA/openssl-easyrsa.cnf" else set_var EASYRSA_SSL_CONF "$EASYRSA/openssl-easyrsa.cnf"
set_var EASYRSA_SAFE_CONF "$EASYRSA/safessl-easyrsa.cnf"
fi fi
# Same as above for the x509-types extensions dir # Same as above for the x509-types extensions dir
@ -1181,7 +1183,7 @@ Note: using Easy-RSA configuration from: $vars"
fi fi
# Setting OPENSSL_CONF prevents bogus warnings (especially useful on win32) # Setting OPENSSL_CONF prevents bogus warnings (especially useful on win32)
export OPENSSL_CONF="$EASYRSA_SSL_CONF" export OPENSSL_CONF="$EASYRSA_SAFE_CONF"
} # vars_setup() } # vars_setup()
# variable assignment by indirection when undefined; merely exports # variable assignment by indirection when undefined; merely exports