diff --git a/README.md b/README.md
index 1e56379..a9d5d31 100644
--- a/README.md
+++ b/README.md
@@ -321,7 +321,7 @@ acme.sh --renew -d example.com --force --ecc
# 11. How to upgrade `acme.sh`
-acme.sh is in constant developement, so it's strongly recommended to use the latest code.
+acme.sh is in constant development, so it's strongly recommended to use the latest code.
You can update acme.sh to the latest code:
diff --git a/acme.sh b/acme.sh
index 6803616..81e0e0c 100755
--- a/acme.sh
+++ b/acme.sh
@@ -406,8 +406,10 @@ _getfile() {
#Usage: multiline
_base64() {
if [ "$1" ]; then
+ _debug3 "base64 multiline:'$1'"
$OPENSSL_BIN base64 -e
else
+ _debug3 "base64 single line."
$OPENSSL_BIN base64 -e | tr -d '\r\n'
fi
}
@@ -932,6 +934,8 @@ _calcjwk() {
modulus=$($OPENSSL_BIN rsa -in "$keyfile" -modulus -noout | cut -d '=' -f 2)
_debug3 modulus "$modulus"
n="$(printf "%s" "$modulus" | _h2b | _base64 | _urlencode)"
+ _debug3 n "$n"
+
jwk='{"e": "'$e'", "kty": "RSA", "n": "'$n'"}'
_debug3 jwk "$jwk"
@@ -1913,7 +1917,7 @@ _setApache() {
fi
_info "JFYI, Config file $httpdconf is backuped to $APACHE_CONF_BACKUP_DIR/$httpdconfname"
_info "In case there is an error that can not be restored automatically, you may try restore it yourself."
- _info "The backup file will be deleted on sucess, just forget it."
+ _info "The backup file will be deleted on success, just forget it."
#add alias
@@ -3780,7 +3784,7 @@ install() {
if [ -z "$NO_DETECT_SH" ]; then
#Modify shebang
if _exists bash; then
- _info "Good, bash is found, so change the shebang to use bash as prefered."
+ _info "Good, bash is found, so change the shebang to use bash as preferred."
_shebang='#!/usr/bin/env bash'
_setShebang "$LE_WORKING_DIR/$PROJECT_ENTRY" "$_shebang"
for subf in $_SUB_FOLDERS; do
diff --git a/dnsapi/dns_ali.sh b/dnsapi/dns_ali.sh
index 3086721..98c56f8 100644
--- a/dnsapi/dns_ali.sh
+++ b/dnsapi/dns_ali.sh
@@ -35,7 +35,7 @@ dns_ali_rm() {
_clean
}
-#################### Private functions bellow ##################################
+#################### Private functions below ##################################
_get_root() {
domain=$1
diff --git a/dnsapi/dns_aws.sh b/dnsapi/dns_aws.sh
index 63542cc..86d4d04 100644
--- a/dnsapi/dns_aws.sh
+++ b/dnsapi/dns_aws.sh
@@ -42,7 +42,7 @@ dns_aws_add() {
_aws_tmpl_xml="UPSERT$fulldomainTXT300\"$txtvalue\""
if aws_rest POST "2013-04-01$_domain_id/rrset/" "" "$_aws_tmpl_xml" && _contains "$response" "ChangeResourceRecordSetsResponse"; then
- _info "txt record updated sucess."
+ _info "txt record updated success."
return 0
fi
@@ -66,7 +66,7 @@ dns_aws_rm() {
_aws_tmpl_xml="DELETE\"$txtvalue\"$fulldomain.TXT300"
if aws_rest POST "2013-04-01$_domain_id/rrset/" "" "$_aws_tmpl_xml" && _contains "$response" "ChangeResourceRecordSetsResponse"; then
- _info "txt record deleted sucess."
+ _info "txt record deleted success."
return 0
fi
@@ -74,7 +74,7 @@ dns_aws_rm() {
}
-#################### Private functions bellow ##################################
+#################### Private functions below ##################################
_get_root() {
domain=$1
diff --git a/dnsapi/dns_cf.sh b/dnsapi/dns_cf.sh
index 309eee5..e13e6d7 100755
--- a/dnsapi/dns_cf.sh
+++ b/dnsapi/dns_cf.sh
@@ -120,7 +120,7 @@ dns_cf_rm() {
}
-#################### Private functions bellow ##################################
+#################### Private functions below ##################################
#_acme-challenge.www.domain.com
#returns
# _sub_domain=_acme-challenge.www
diff --git a/dnsapi/dns_cx.sh b/dnsapi/dns_cx.sh
index 86a7b2d..f7f2081 100755
--- a/dnsapi/dns_cx.sh
+++ b/dnsapi/dns_cx.sh
@@ -131,7 +131,7 @@ update_record() {
return 1
}
-#################### Private functions bellow ##################################
+#################### Private functions below ##################################
#_acme-challenge.www.domain.com
#returns
# _sub_domain=_acme-challenge.www
diff --git a/dnsapi/dns_dp.sh b/dnsapi/dns_dp.sh
index e2952d7..06833b4 100755
--- a/dnsapi/dns_dp.sh
+++ b/dnsapi/dns_dp.sh
@@ -158,7 +158,7 @@ update_record() {
return 1 #error
}
-#################### Private functions bellow ##################################
+#################### Private functions below ##################################
#_acme-challenge.www.domain.com
#returns
# _sub_domain=_acme-challenge.www
diff --git a/dnsapi/dns_gd.sh b/dnsapi/dns_gd.sh
index 9470ed2..8100056 100755
--- a/dnsapi/dns_gd.sh
+++ b/dnsapi/dns_gd.sh
@@ -59,7 +59,7 @@ dns_gd_rm() {
}
-#################### Private functions bellow ##################################
+#################### Private functions below ##################################
#_acme-challenge.www.domain.com
#returns
# _sub_domain=_acme-challenge.www
diff --git a/dnsapi/dns_ispconfig.sh b/dnsapi/dns_ispconfig.sh
index 789b626..a84d95d 100755
--- a/dnsapi/dns_ispconfig.sh
+++ b/dnsapi/dns_ispconfig.sh
@@ -30,7 +30,7 @@ dns_ispconfig_rm() {
_ISPC_credentials && _ISPC_login && _ISPC_rmTxt
}
-#################### Private functions bellow ##################################
+#################### Private functions below ##################################
_ISPC_credentials() {
if [ -z "${ISPC_User}" ] || [ -z "$ISPC_Password" ] || [ -z "${ISPC_Api}" ] || [ -z "${ISPC_Api_Insecure}" ]; then
diff --git a/dnsapi/dns_lua.sh b/dnsapi/dns_lua.sh
index 2c7ec4b..bc06b3e 100755
--- a/dnsapi/dns_lua.sh
+++ b/dnsapi/dns_lua.sh
@@ -84,7 +84,7 @@ dns_lua_rm() {
}
-#################### Private functions bellow ##################################
+#################### Private functions below ##################################
#_acme-challenge.www.domain.com
#returns
# _sub_domain=_acme-challenge.www
diff --git a/dnsapi/dns_me.sh b/dnsapi/dns_me.sh
index 2a03f53..d7a1b19 100755
--- a/dnsapi/dns_me.sh
+++ b/dnsapi/dns_me.sh
@@ -81,7 +81,7 @@ dns_me_rm() {
}
-#################### Private functions bellow ##################################
+#################### Private functions below ##################################
#_acme-challenge.www.domain.com
#returns
# _sub_domain=_acme-challenge.www
diff --git a/dnsapi/dns_myapi.sh b/dnsapi/dns_myapi.sh
index e5a98dd..6bf6250 100755
--- a/dnsapi/dns_myapi.sh
+++ b/dnsapi/dns_myapi.sh
@@ -23,7 +23,7 @@ dns_myapi_add() {
}
#Usage: fulldomain txtvalue
-#Remove the txt record afer validation.
+#Remove the txt record after validation.
dns_myapi_rm() {
fulldomain=$1
txtvalue=$2
@@ -32,4 +32,4 @@ dns_myapi_rm() {
_debug txtvalue "$txtvalue"
}
-#################### Private functions bellow ##################################
+#################### Private functions below ##################################
diff --git a/dnsapi/dns_nsupdate.sh b/dnsapi/dns_nsupdate.sh
index 8067d2f..7acb2ef 100755
--- a/dnsapi/dns_nsupdate.sh
+++ b/dnsapi/dns_nsupdate.sh
@@ -44,7 +44,7 @@ EOF
return 0
}
-#################### Private functions bellow ##################################
+#################### Private functions below ##################################
_checkKeyFile() {
if [ -z "${NSUPDATE_KEY}" ]; then
diff --git a/dnsapi/dns_ovh.sh b/dnsapi/dns_ovh.sh
index 377b3de..18b9c34 100755
--- a/dnsapi/dns_ovh.sh
+++ b/dnsapi/dns_ovh.sh
@@ -182,7 +182,7 @@ dns_ovh_rm() {
}
-#################### Private functions bellow ##################################
+#################### Private functions below ##################################
_ovh_authentication() {
diff --git a/dnsapi/dns_pdns.sh b/dnsapi/dns_pdns.sh
index a2c2907..06763d8 100755
--- a/dnsapi/dns_pdns.sh
+++ b/dnsapi/dns_pdns.sh
@@ -130,7 +130,7 @@ notify_slaves() {
return 0
}
-#################### Private functions bellow ##################################
+#################### Private functions below ##################################
#_acme-challenge.www.domain.com
#returns
# _domain=domain.com