Merge pull request #4536 from acmesh-official/dev

sync
This commit is contained in:
neil 2023-03-04 21:26:18 +08:00 committed by GitHub
commit 799e402077
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2873,7 +2873,7 @@ _initpath() {
if _isEccKey "$_ilength"; then
DOMAIN_PATH="$domainhomeecc"
else
elif [ -z "$__SELECTED_RSA_KEY" ]; then
if [ ! -d "$domainhome" ] && [ -d "$domainhomeecc" ]; then
_info "The domain '$domain' seems to have a ECC cert already, lets use ecc cert."
DOMAIN_PATH="$domainhomeecc"
@ -7518,6 +7518,9 @@ _process() {
--keylength | -k)
_keylength="$2"
shift
if [ "$_keylength" ] && ! _isEccKey "$_keylength"; then
export __SELECTED_RSA_KEY=1
fi
;;
-ak | --accountkeylength)
_accountkeylength="$2"