plantroon
/
acme.sh
mirror of https://github.com/plantroon/acme.sh.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix https://github.com/Neilpang/acme.sh/issues/2192

This commit is contained in:
neilpang 2019-04-21 12:23:06 +08:00
parent 9c9fed749a
commit 4f1888d2ea
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
acme.sh
View File

@ -1312,13 +1312,19 @@ _create_account_key() {
_initpath _initpath
mkdir -p "$CA_DIR" mkdir -p "$CA_DIR"
if [ -f "$ACCOUNT_KEY_PATH" ]; then if [ -s "$ACCOUNT_KEY_PATH" ]; then
_info "Account key exists, skip" _info "Account key exists, skip"
return return 0
else else
#generate account key #generate account key
_createkey "$length" "$ACCOUNT_KEY_PATH" if _createkey "$length" "$ACCOUNT_KEY_PATH"; then
chmod 600 "$ACCOUNT_KEY_PATH" chmod 600 "$ACCOUNT_KEY_PATH"
_info "Create account key ok."
return 0
else
_err "Create account key error."
return 1
fi
fi fi
} }
@ -1341,11 +1347,14 @@ createDomainKey() {
_initpath "$domain" "$_cdl" _initpath "$domain" "$_cdl"
if [ ! -f "$CERT_KEY_PATH" ] || ([ "$FORCE" ] && ! [ "$IS_RENEW" ]) || [ "$Le_ForceNewDomainKey" = "1" ]; then if [ ! -f "$CERT_KEY_PATH" ] || [ ! -s "$CERT_KEY_PATH" ] || ([ "$FORCE" ] && ! [ "$IS_RENEW" ]) || [ "$Le_ForceNewDomainKey" = "1" ]; then
if _createkey "$_cdl" "$CERT_KEY_PATH"; then if _createkey "$_cdl" "$CERT_KEY_PATH"; then
_savedomainconf Le_Keylength "$_cdl" _savedomainconf Le_Keylength "$_cdl"
_info "The domain key is here: $(__green $CERT_KEY_PATH)" _info "The domain key is here: $(__green $CERT_KEY_PATH)"
return 0 return 0
else
_err "Can not domain key"
return 1
fi fi
else else
if [ "$IS_RENEW" ]; then if [ "$IS_RENEW" ]; then