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

Fix incorrect handling of invalid --use-algo option

Browse Source 
The prior warn/fallback to rsa didn't work, and fallback is probably the
wrong thing to do, especially for batch callers. It is now an error to
supply an invalid value.

No need to export the EASYRSA_ALGO_PARAMS either.

Signed-off-by: Josh Cepek <josh.cepek@usa.net>
This commit is contained in:
Josh Cepek 2013-12-11 12:01:04 -06:00
parent c86289ba17
commit 1c90df94ea
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
easyrsa3/easyrsa
View File

@ -966,14 +966,13 @@ Note: using Easy-RSA configuration from: $vars"
else set_var EASYRSA_EXT_DIR "$EASYRSA/x509-types"
fi
# EASYRSA_ALGO_PARAMS must be set depending on config. Defaults to rsa
if [ $EASYRSA_ALGO = "ec" ]; then
export EASYRSA_ALGO_PARAMS="$EASYRSA_EC_DIR/${EASYRSA_CURVE}.pem"
# EASYRSA_ALGO_PARAMS must be set depending on selected algo
if [ "ec" = "$EASYRSA_ALGO" ]; then
EASYRSA_ALGO_PARAMS="$EASYRSA_EC_DIR/${EASYRSA_CURVE}.pem"
elif [ "rsa" = "$EASYRSA_ALGO" ]; then
EASYRSA_ALGO_PARAMS="${EASYRSA_KEY_SIZE}"
else
export EASYRSA_ALGO_PARAMS="${EASYRSA_KEY_SIZE}"
# Warn if the ALGO isn't rsa as we default to rsa anyway
[ "$EASYRSA_ALGO" = "rsa" ] || warn "\
Warning: unknown algo '$EASYRSA_ALGO' -- using rsa default"
die "Alg '$EASYRSA_ALGO' is invalid: must be 'rsa' or 'ec'"
fi
# Setting OPENSSL_CONF prevents bogus warnings (especially useful on win32)