Merge 9171bc2f55197422fcc2f223520fe01fd0b94287 into b0535d8b40a30f9fd2b26b3ea2a49469dcb4d0a8

This commit is contained in:
ldlb 2025-04-27 22:35:49 +00:00 committed by GitHub
commit 16b65148ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

8
acme.sh Executable file → Normal file
View File

@ -464,6 +464,12 @@ _contains() {
echo "$_str" | grep -- "$_sub" >/dev/null 2>&1 echo "$_str" | grep -- "$_sub" >/dev/null 2>&1
} }
_contains_fixed() {
_str="$1"
_sub="$2"
echo "$_str" | grep -F -- "$_sub" >/dev/null 2>&1
}
_hasfield() { _hasfield() {
_str="$1" _str="$1"
_field="$2" _field="$2"
@ -1353,7 +1359,7 @@ _readSubjectAltNamesFromCSR() {
_dnsAltnames="$(${ACME_OPENSSL_BIN:-openssl} req -noout -text -in "$_csrfile" | grep "^ *DNS:.*" | tr -d ' \n')" _dnsAltnames="$(${ACME_OPENSSL_BIN:-openssl} req -noout -text -in "$_csrfile" | grep "^ *DNS:.*" | tr -d ' \n')"
_debug _dnsAltnames "$_dnsAltnames" _debug _dnsAltnames "$_dnsAltnames"
if _contains "$_dnsAltnames," "DNS:$_csrsubj,"; then if _contains_fixed "$_dnsAltnames," "DNS:$_csrsubj,"; then
_debug "AltNames contains subject" _debug "AltNames contains subject"
_excapedAlgnames="$(echo "$_dnsAltnames" | tr '*' '#')" _excapedAlgnames="$(echo "$_dnsAltnames" | tr '*' '#')"
_debug _excapedAlgnames "$_excapedAlgnames" _debug _excapedAlgnames "$_excapedAlgnames"