support openssl 3.0

fix https://github.com/acmesh-official/acme.sh/issues/3399
This commit is contained in:
neilpang 2021-02-15 21:25:27 +08:00
parent 9d448a42a7
commit 4528957235

View File

@ -1122,9 +1122,14 @@ _createkey() {
fi fi
fi fi
__traditional=""
if _contains "$(${ACME_OPENSSL_BIN:-openssl} help genrsa 2>&1)" "-traditional"; then
__traditional="-traditional"
fi
if _isEccKey "$length"; then if _isEccKey "$length"; then
_debug "Using ec name: $eccname" _debug "Using ec name: $eccname"
if _opkey="$(${ACME_OPENSSL_BIN:-openssl} ecparam -name "$eccname" -genkey 2>/dev/null)"; then if _opkey="$(${ACME_OPENSSL_BIN:-openssl} ecparam $__traditional -name "$eccname" -genkey 2>/dev/null)"; then
echo "$_opkey" >"$f" echo "$_opkey" >"$f"
else else
_err "error ecc key name: $eccname" _err "error ecc key name: $eccname"
@ -1132,7 +1137,7 @@ _createkey() {
fi fi
else else
_debug "Using RSA: $length" _debug "Using RSA: $length"
if _opkey="$(${ACME_OPENSSL_BIN:-openssl} genrsa "$length" 2>/dev/null)"; then if _opkey="$(${ACME_OPENSSL_BIN:-openssl} genrsa $__traditional "$length" 2>/dev/null)"; then
echo "$_opkey" >"$f" echo "$_opkey" >"$f"
else else
_err "error rsa key: $length" _err "error rsa key: $length"