Only use build_ecparam_file() when required

Signed-off-by: Richard T Bonhomme <[email protected]>

Author: TinCanTech

easyrsa3/easyrsa

@@ -1846,6 +1846,7 @@ Please update 'openssl-easyrsa.cnf' to the latest Easy-RSA release."
 			|| die "Failed create CA private key"
 	;;
 	ec)
+	build_ecparam_file
 	easyrsa_openssl genpkey \
 		-paramfile "$EASYRSA_ALGO_PARAMS" \
 		-out "$out_key_tmp" \
@@ -2255,6 +2256,7 @@ $EASYRSA_EXTRA_EXTS"
 	case "$EASYRSA_ALGO" in
 		rsa|ec)
 			# Set elliptic curve parameters-file
+			build_ecparam_file
 			# or RSA bit-length
 			algo_opts="$EASYRSA_ALGO:$EASYRSA_ALGO_PARAMS"
 			;;
@@ -5415,25 +5417,16 @@ Elliptic curve cryptography cannot be use with algo '$EASYRSA_ALGO'"
 		EASYRSA_ALGO_PARAMS="$EASYRSA_KEY_SIZE"
 		;;
 	ec)
-		case "$cmd" in
-		build-ca|gen-req|build-*-full)
-			# build ec-params file as $EASYRSA_ALGO_PARAMS
-			build_ecparam_file
-			;;
-		*)
-			# Verify Elliptic curve
-			"$EASYRSA_OPENSSL" ecparam \
-				-name "$EASYRSA_CURVE" \
-				>/dev/null 2>&1 || user_error "\
-Failed to generate ecparam file for curve '$EASYRSA_CURVE'"
-		esac
+		# Verify Elliptic curve
+		"$EASYRSA_OPENSSL" ecparam -name "$EASYRSA_CURVE" \
+			>/dev/null 2>&1 || user_error \
+				"Failed to generate ecparam file for curve '$EASYRSA_CURVE'"
 		;;
 	ed)
 		# Verify Edwards curve
-		"$EASYRSA_OPENSSL" genpkey \
-			-algorithm "$EASYRSA_CURVE" \
-			>/dev/null 2>&1 || user_error "\
-Edwards Curve '$EASYRSA_CURVE' not found."
+		"$EASYRSA_OPENSSL" genpkey -algorithm "$EASYRSA_CURVE" \
+			>/dev/null 2>&1 || user_error \
+				"Edwards Curve '$EASYRSA_CURVE' not found."
 		;;
 	*) user_error "\
 Unknown algorithm '$EASYRSA_ALGO': Must be 'rsa', 'ec' or 'ed'"
@@ -5442,16 +5435,13 @@ Unknown algorithm '$EASYRSA_ALGO': Must be 'rsa', 'ec' or 'ed'"
 verify_algo_params; OK: algo '$EASYRSA_ALGO' | curve '$EASYRSA_CURVE'"
 } # => verify_algo_params()
 
-# build ecparam file
+# build ecparam file - required for EC private keys
 build_ecparam_file() {
 	# Only valid for algo ec
 	[ "$EASYRSA_ALGO" = ec ] || return 0
 
-	# User specified algo params file exists
-	[ "$EASYRSA_ALGO_PARAMS" ] && [ -f "$EASYRSA_ALGO_PARAMS" ] && return
+	unset -v EASYRSA_ALGO_PARAMS
 	easyrsa_mktemp EASYRSA_ALGO_PARAMS
-
-	# Create the required ecparams file, temp-file
 	"$EASYRSA_OPENSSL" ecparam -name "$EASYRSA_CURVE" \
 		-out "$EASYRSA_ALGO_PARAMS" >/dev/null 2>&1 || user_error \
 			"Failed to generate ecparam file for curve '$EASYRSA_CURVE'"