removed anti_newline helper

diff --git a/letsencrypt.sh b/letsencrypt.sh
index 7fd89a981bbd8807f7da7df09c2afc26013370f3..30f01ec8c748158de0d02237c5e81740d80f6eaa 100755 (executable)
--- 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}"'"}}'