]> git.street.me.uk Git - andy/dehydrated.git/commitdiff
wat. removed some unnecessary code.
authorLukas Schauer <lukas@schauer.so>
Sat, 19 Dec 2015 22:24:29 +0000 (23:24 +0100)
committerLukas Schauer <lukas@schauer.so>
Sat, 19 Dec 2015 22:24:29 +0000 (23:24 +0100)
letsencrypt.sh

index 30507f5aaff5d0e5e545949fdc22d72493475f46..44ba55641acc1697f5f6a7b5c5f3c99cb40d8904 100755 (executable)
@@ -127,8 +127,8 @@ 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)"