lib/func.tcl: Hack output of `openssl dgst -hex'.
authorMark Wooding <mdw@distorted.org.uk>
Sat, 1 Dec 2012 19:51:12 +0000 (19:51 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Sat, 1 Dec 2012 19:58:39 +0000 (19:58 +0000)
Remove the gratuitous incompatibility from the front.

lib/func.tcl

index 04bd206..1f73008 100644 (file)
@@ -448,10 +448,10 @@ proc sync-profiles {} {
 proc req-key-hash {file} {
   ## Return the key hash from the certificate request in FILE.
 
-  return [exec \
+  return [lindex [exec \
              openssl req -in $file -noout -pubkey | \
              openssl rsa 2>/dev/null -pubin -outform der | \
-             openssl dgst -sha256 -hex]
+             openssl dgst -sha256 -hex] end]
 }
 
 proc req-dn {file} {
@@ -466,10 +466,10 @@ proc req-dn {file} {
 proc cert-key-hash {file} {
   ## Return the key hash from the certificate in FILE.
 
-  return [exec \
+  return [lindex [exec \
              openssl x509 -in $file -noout -pubkey | \
              openssl rsa 2>/dev/null -pubin -outform der | \
-             openssl dgst -sha256 -hex]
+             openssl dgst -sha256 -hex] end]
 }
 
 proc cert-dn {file} {