pyrox.dev
1diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa
2index 6fec288..210648a 100755
3--- a/easyrsa3/easyrsa
4+++ b/easyrsa3/easyrsa
5@@ -1003,7 +1003,7 @@ Note: using Easy-RSA configuration from: $vars"
6
7 # Set defaults, preferring existing env-vars if present
8 set_var EASYRSA "$PWD"
9- set_var EASYRSA_OPENSSL openssl
10+ set_var EASYRSA_OPENSSL "@openssl@"
11 set_var EASYRSA_PKI "$EASYRSA/pki"
12 set_var EASYRSA_DN cn_only
13 set_var EASYRSA_REQ_COUNTRY "US"
14@@ -1030,13 +1030,17 @@ Note: using Easy-RSA configuration from: $vars"
15 # Detect openssl config, preferring EASYRSA_PKI over EASYRSA
16 if [ -f "$EASYRSA_PKI/openssl-1.0.cnf" ]; then
17 set_var EASYRSA_SSL_CONF "$EASYRSA_PKI/openssl-1.0.cnf"
18- else set_var EASYRSA_SSL_CONF "$EASYRSA/openssl-1.0.cnf"
19+ elif [ -f "$EASYRSA/openssl-1.0.cnf" ]; then
20+ set_var EASYRSA_SSL_CONF "$EASYRSA/openssl-1.0.cnf"
21+ else set_var EASYRSA_SSL_CONF "@out@/share/easyrsa/openssl-1.0.cnf"
22 fi
23
24 # Same as above for the x509-types extensions dir
25 if [ -d "$EASYRSA_PKI/x509-types" ]; then
26 set_var EASYRSA_EXT_DIR "$EASYRSA_PKI/x509-types"
27- else set_var EASYRSA_EXT_DIR "$EASYRSA/x509-types"
28+ elif [ -d "$EASYRSA/x509-types" ]; then
29+ set_var EASYRSA_EXT_DIR "$EASYRSA/x509-types"
30+ else set_var EASYRSA_EXT_DIR "@out@/share/easyrsa/x509-types"
31 fi
32
33 # EASYRSA_ALGO_PARAMS must be set depending on selected algo