diff --git a/letsencrypt.sh b/letsencrypt.sh index 7fd89a9..30f01ec 100755 --- a/letsencrypt.sh +++ b/letsencrypt.sh @@ -129,13 +129,10 @@ _exiterr() { exit 1 } -anti_newline() { - tr -d '\n\r' -} - +# Encode data as url-safe formatted base64 urlbase64() { # urlbase64: base64 encoded string with '+' replaced with '-' and '/' replaced with '_' - openssl base64 -e | anti_newline | sed 's/=*$//g' | tr '+/' '-_' + openssl base64 -e | tr -d '\n\r' | sed 's/=*$//g' | tr '+/' '-_' } # Convert hex string to binary data @@ -208,7 +205,7 @@ signed_request() { payload64="$(printf '%s' "${2}" | urlbase64)" # Retrieve nonce from acme-server - nonce="$(http_request head "${CA}" | grep Replay-Nonce: | awk -F ': ' '{print $2}' | anti_newline)" + nonce="$(http_request head "${CA}" | grep Replay-Nonce: | awk -F ': ' '{print $2}' | tr -d '\n\r')" # Build header with just our public key and algorithm information header='{"alg": "RS256", "jwk": {"e": "'"${pubExponent64}"'", "kty": "RSA", "n": "'"${pubMod64}"'"}}'