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

Rename config to openssl-easyrsa.cnf

Browse Source 
This clarifies the use of the file as specific to EasyRSA while also
closing the loop on the openssl version chase.  No reason to have a
configuration file that is specific to openssl version at this point.
If the need arises, we'll do so in a sane fashion.

Resolves #159

Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
This commit is contained in:
Eric F Crist 2017-11-04 08:06:48 -05:00
parent c75e74a697
commit e8cd6c9807
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/EasyRSA-Advanced.md
View File

@ -52,8 +52,8 @@ Configuration Reference
1. The env-var `EASYRSA_SSL_CONF`
2. The 'vars' file (see `vars Autodetection` above)
3. The `EASYRSA_PKI` directory with a filename of `openssl-1.0.cnf`
4. The `EASYRSA` directory with a filename of `openssl-1.0.cnf`
3. The `EASYRSA_PKI` directory with a filename of `openssl-easyrsa.cnf`
4. The `EASYRSA` directory with a filename of `openssl-easyrsa.cnf`
Advanced extension handling
---------------------------

6
easyrsa3/easyrsa
View File

@ -1068,9 +1068,9 @@ Note: using Easy-RSA configuration from: $vars"
set_var EASYRSA_DIGEST sha256
# Detect openssl config, preferring EASYRSA_PKI over EASYRSA
if [ -f "$EASYRSA_PKI/openssl-1.0.cnf" ]; then
set_var EASYRSA_SSL_CONF "$EASYRSA_PKI/openssl-1.0.cnf"
else set_var EASYRSA_SSL_CONF "$EASYRSA/openssl-1.0.cnf"
if [ -f "$EASYRSA_PKI/openssl-easyrsa.cnf" ]; then
set_var EASYRSA_SSL_CONF "$EASYRSA_PKI/openssl-easyrsa.cnf"
else set_var EASYRSA_SSL_CONF "$EASYRSA/openssl-easyrsa.cnf"
fi
# Same as above for the x509-types extensions dir

0
easyrsa3/openssl-1.0.cnf → easyrsa3/openssl-easyrsa.cnf
View File

4
easyrsa3/vars.example
View File

@ -179,12 +179,12 @@ fi
# OpenSSL config file:
# If you need to use a specific openssl config file, you can reference it here.
# Normally this file is auto-detected from a file named openssl-1.0.cnf from the
# Normally this file is auto-detected from a file named openssl-easyrsa.cnf from the
# EASYRSA_PKI or EASYRSA dir (in that order.) NOTE that this file is Easy-RSA
# specific and you cannot just use a standard config file, so this is an
# advanced feature.
#set_var EASYRSA_SSL_CONF "$EASYRSA/openssl-1.0.cnf"
#set_var EASYRSA_SSL_CONF "$EASYRSA/openssl-easyrsa.cnf"
# Default CN:
# This is best left alone. Interactively you will set this manually, and BATCH