plantroon/acme.sh
1
0
Fork 0
mirror of https://github.com/plantroon/acme.sh.git synced 2024-12-26 23:11:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3035 from acmesh-official/dev

Browse Source 
sync
This commit is contained in:
neil 2020-07-08 23:12:19 +08:00 committed by GitHub
commit 84e1f3649f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.10 FROM alpine:3.12
RUN apk update -f \ RUN apk update -f \
&& apk --no-cache add -f \ && apk --no-cache add -f \

38
acme.sh
View File

@ -1014,8 +1014,32 @@ _sign() {
fi fi
_debug3 "_signedECText" "$_signedECText" _debug3 "_signedECText" "$_signedECText"
_ec_r="$(echo "$_signedECText" | _head_n 2 | _tail_n 1 | cut -d : -f 4 | tr -d "\r\n")" _ec_r="$(echo "$_signedECText" | _head_n 2 | _tail_n 1 | cut -d : -f 4 | tr -d "\r\n")"
_debug3 "_ec_r" "$_ec_r"
_ec_s="$(echo "$_signedECText" | _head_n 3 | _tail_n 1 | cut -d : -f 4 | tr -d "\r\n")" _ec_s="$(echo "$_signedECText" | _head_n 3 | _tail_n 1 | cut -d : -f 4 | tr -d "\r\n")"
if [ "$__ECC_KEY_LEN" -eq "256" ]; then
while [ "${#_ec_r}" -lt "64" ]; do
_ec_r="0${_ec_r}"
done
while [ "${#_ec_s}" -lt "64" ]; do
_ec_s="0${_ec_s}"
done
fi
if [ "$__ECC_KEY_LEN" -eq "384" ]; then
while [ "${#_ec_r}" -lt "96" ]; do
_ec_r="0${_ec_r}"
done
while [ "${#_ec_s}" -lt "96" ]; do
_ec_s="0${_ec_s}"
done
fi
if [ "$__ECC_KEY_LEN" -eq "512" ]; then
while [ "${#_ec_r}" -lt "132" ]; do
_ec_r="0${_ec_r}"
done
while [ "${#_ec_s}" -lt "132" ]; do
_ec_s="0${_ec_s}"
done
fi
_debug3 "_ec_r" "$_ec_r"
_debug3 "_ec_s" "$_ec_s" _debug3 "_ec_s" "$_ec_s"
printf "%s" "$_ec_r$_ec_s" | _h2b | _base64 printf "%s" "$_ec_r$_ec_s" | _h2b | _base64
else else
@ -4098,17 +4122,17 @@ $_authorizations_map"
if [ "$ACME_VERSION" = "2" ]; then if [ "$ACME_VERSION" = "2" ]; then
_idn_d="$(_idn "$d")" _idn_d="$(_idn "$d")"
_candindates="$(echo "$_authorizations_map" | grep -i "^$_idn_d,")" _candidates="$(echo "$_authorizations_map" | grep -i "^$_idn_d,")"
_debug2 _candindates "$_candindates" _debug2 _candidates "$_candidates"
if [ "$(echo "$_candindates" | wc -l)" -gt 1 ]; then if [ "$(echo "$_candidates" | wc -l)" -gt 1 ]; then
for _can in $_candindates; do for _can in $_candidates; do
if _startswith "$(echo "$_can" | tr '.' '|')" "$(echo "$_idn_d" | tr '.' '|'),"; then if _startswith "$(echo "$_can" | tr '.' '|')" "$(echo "$_idn_d" | tr '.' '|'),"; then
_candindates="$_can" _candidates="$_can"
break break
fi fi
done done
fi fi
response="$(echo "$_candindates" | sed "s/$_idn_d,//")" response="$(echo "$_candidates" | sed "s/$_idn_d,//")"
_debug2 "response" "$response" _debug2 "response" "$response"
if [ -z "$response" ]; then if [ -z "$response" ]; then
_err "get to authz error." _err "get to authz error."

2
dnsapi/dns_variomedia.sh
View File

@ -107,7 +107,7 @@ _get_root() {
fi fi
if _startswith "$response" "\{\"data\":"; then if _startswith "$response" "\{\"data\":"; then
if _contains "$response" "\"id\": \"$h\""; then if _contains "$response" "\"id\":\"$h\""; then
_sub_domain="$(echo "$fulldomain" | sed "s/\\.$h\$//")" _sub_domain="$(echo "$fulldomain" | sed "s/\\.$h\$//")"
_domain=$h _domain=$h
return 0 return 0