Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
0a0838b6
Unverified
Commit
0a0838b6
authored
May 11, 2022
by
neil
Committed by
GitHub
May 11, 2022
Browse files
Merge pull request #4078 from cboylan/fix-key-length-check
Fix Le_Keylength checks during renewals
parents
f16e060e
b376dfa1
Changes
1
Show whitespace changes
Inline
Side-by-side
acme.sh
View file @
0a0838b6
...
@@ -4406,7 +4406,13 @@ issue() {
...
@@ -4406,7 +4406,13 @@ issue() {
if
[
-f
"
$CSR_PATH
"
]
&&
[
!
-f
"
$CERT_KEY_PATH
"
]
;
then
if
[
-f
"
$CSR_PATH
"
]
&&
[
!
-f
"
$CERT_KEY_PATH
"
]
;
then
_info
"Signing from existing CSR."
_info
"Signing from existing CSR."
else
else
# When renewing from an old version, the empty Le_Keylength means 2048.
# Note, do not use DEFAULT_DOMAIN_KEY_LENGTH as that value may change over
# time but an empty value implies 2048 specifically.
_key
=
$(
_readdomainconf Le_Keylength
)
_key
=
$(
_readdomainconf Le_Keylength
)
if
[
-z
"
$_key
"
]
;
then
_key
=
2048
fi
_debug
"Read key length:
$_key
"
_debug
"Read key length:
$_key
"
if
[
!
-f
"
$CERT_KEY_PATH
"
]
||
[
"
$_key_length
"
!=
"
$_key
"
]
||
[
"
$Le_ForceNewDomainKey
"
=
"1"
]
;
then
if
[
!
-f
"
$CERT_KEY_PATH
"
]
||
[
"
$_key_length
"
!=
"
$_key
"
]
||
[
"
$Le_ForceNewDomainKey
"
=
"1"
]
;
then
if
!
createDomainKey
"
$_main_domain
"
"
$_key_length
"
;
then
if
!
createDomainKey
"
$_main_domain
"
"
$_key_length
"
;
then
...
@@ -5319,7 +5325,10 @@ renew() {
...
@@ -5319,7 +5325,10 @@ renew() {
Le_PostHook
=
"
$(
_readdomainconf Le_PostHook
)
"
Le_PostHook
=
"
$(
_readdomainconf Le_PostHook
)
"
Le_RenewHook
=
"
$(
_readdomainconf Le_RenewHook
)
"
Le_RenewHook
=
"
$(
_readdomainconf Le_RenewHook
)
"
Le_Preferred_Chain
=
"
$(
_readdomainconf Le_Preferred_Chain
)
"
Le_Preferred_Chain
=
"
$(
_readdomainconf Le_Preferred_Chain
)
"
#when renew from an old version, the empty Le_Keylength means 2048
# When renewing from an old version, the empty Le_Keylength means 2048.
# Note, do not use DEFAULT_DOMAIN_KEY_LENGTH as that value may change over
# time but an empty value implies 2048 specifically.
Le_Keylength
=
"
$(
_readdomainconf Le_Keylength
)
"
if
[
-z
"
$Le_Keylength
"
]
;
then
if
[
-z
"
$Le_Keylength
"
]
;
then
Le_Keylength
=
2048
Le_Keylength
=
2048
fi
fi
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment