fix thumbprint

This commit is contained in:
neilpang 2016-10-28 23:30:32 +08:00
parent 8a29fbc850
commit cae203be71
1 changed files with 9 additions and 6 deletions

11
acme.sh
View File

@ -2109,8 +2109,6 @@ _regAccount() {
while true ;
do
_debug AGREEMENT "$AGREEMENT"
accountkey_json=$(printf "%s" "$jwk" | tr -d ' ' )
thumbprint=$(printf "%s" "$accountkey_json" | _digest "sha256" | _urlencode)
regjson='{"resource": "'$_reg_res'", "agreement": "'$AGREEMENT'"}'
@ -2348,8 +2346,8 @@ issue() {
_savedomainconf "Le_Keylength" "$Le_Keylength"
vlist="$Le_Vlist"
# verify each domain
_info "Verify each domain"
_info "Getting domain auth token for each domain"
sep='#'
if [ -z "$vlist" ] ; then
alldomains=$(echo "$Le_Domain,$Le_Alt" | tr ',' ' ' )
@ -2381,6 +2379,11 @@ issue() {
return 1
fi
if [ -z "$thumbprint" ] ; then
accountkey_json=$(printf "%s" "$jwk" | tr -d ' ' )
thumbprint=$(printf "%s" "$accountkey_json" | _digest "sha256" | _urlencode)
fi
entry="$(printf "%s\n" "$response" | _egrep_o '[^\{]*"type":"'$vtype'"[^\}]*')"
_debug entry "$entry"
if [ -z "$entry" ] ; then