From e8cd6c980742bb86c34286e655346778275cc36d Mon Sep 17 00:00:00 2001 From: Eric F Crist Date: Sat, 4 Nov 2017 08:06:48 -0500 Subject: [PATCH] Rename config to openssl-easyrsa.cnf 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 --- doc/EasyRSA-Advanced.md | 4 ++-- easyrsa3/easyrsa | 6 +++--- easyrsa3/{openssl-1.0.cnf => openssl-easyrsa.cnf} | 0 easyrsa3/vars.example | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) rename easyrsa3/{openssl-1.0.cnf => openssl-easyrsa.cnf} (100%) diff --git a/doc/EasyRSA-Advanced.md b/doc/EasyRSA-Advanced.md index 5bcd526..170165c 100644 --- a/doc/EasyRSA-Advanced.md +++ b/doc/EasyRSA-Advanced.md @@ -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 --------------------------- diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa index 11d2357..21e4ba3 100755 --- a/easyrsa3/easyrsa +++ b/easyrsa3/easyrsa @@ -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 diff --git a/easyrsa3/openssl-1.0.cnf b/easyrsa3/openssl-easyrsa.cnf similarity index 100% rename from easyrsa3/openssl-1.0.cnf rename to easyrsa3/openssl-easyrsa.cnf diff --git a/easyrsa3/vars.example b/easyrsa3/vars.example index c439cba..327a297 100644 --- a/easyrsa3/vars.example +++ b/easyrsa3/vars.example @@ -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