From: Lukas Schauer <lukas2511@users.noreply.github.com>
Date: Sat, 19 Dec 2015 22:34:08 +0000 (+0100)
Subject: Merge pull request #59 from erdgeist/master
X-Git-Tag: v0.1.0~94
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d64c8d452496410c8827059d9ef9635c6153028;p=thirdparty%2Fdehydrated.git

Merge pull request #59 from erdgeist/master

when using printf, we do not need inline expansion of variables
---

6d64c8d452496410c8827059d9ef9635c6153028
diff --cc letsencrypt.sh
index 44ba556,7164db3..bad985f
--- a/letsencrypt.sh
+++ b/letsencrypt.sh
@@@ -127,10 -127,10 +127,10 @@@ init_system() 
    fi
  
    # Get public components from private key and calculate thumbprint
 -  pubExponent64="$(printf "%06x" "$(openssl rsa -in "${PRIVATE_KEY}" -noout -text | grep publicExponent | head -1 | cut -d' ' -f2)" | hex2bin | urlbase64)"
 -  pubMod64="$(printf '%s' "$(openssl rsa -in "${PRIVATE_KEY}" -noout -modulus | cut -d'=' -f2)" | hex2bin | urlbase64)"
 +  pubExponent64="$(openssl rsa -in "${PRIVATE_KEY}" -noout -text | grep publicExponent | grep -oE "0x[a-f0-9]+" | cut -d'x' -f2 | hex2bin | urlbase64)"
 +  pubMod64="$(openssl rsa -in "${PRIVATE_KEY}" -noout -modulus | cut -d'=' -f2 | hex2bin | urlbase64)"
  
-   thumbprint="$(printf '%s' '{"e":"'"${pubExponent64}"'","kty":"RSA","n":"'"${pubMod64}"'"}' | openssl sha -sha256 -binary | urlbase64)"
+   thumbprint="$(printf '{"e":"%s","kty":"RSA","n":"%s"}' "${pubExponent64}" "${pubMod64}" | openssl sha -sha256 -binary | urlbase64)"
  
    # If we generated a new private key in the step above we have to register it with the acme-server
    if [[ "${register}" = "1" ]]; then