From ae090c58719726fd0027c4c606bc82faf55b1bc9 Mon Sep 17 00:00:00 2001
From: joe <joe@jerkface.net>
Date: Fri, 9 May 2014 21:56:13 -0400
Subject: --torhash accepts CERTIFICATE pem

---
 kiki.hs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kiki.hs b/kiki.hs
index e992087..8d1d7cb 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -396,7 +396,9 @@ show_torhash pubkey _ = do
                      $ pemParser (Just "RSA PUBLIC KEY")
         pkcs8 = fmap ( parsekey (\f (RSAKey8 n e) -> f n e) . pemBlob )
                      $ pemParser (Just "PUBLIC KEY")
-        keys = catMaybes $ scanAndParse (pkcs1 <> pkcs8) $ Char8.lines bs
+        cert = fmap (fmap pcertKey . parseCertBlob False . pemBlob)
+                     $ pemParser (Just "CERTIFICATE")
+        keys = catMaybes $ scanAndParse (pkcs1 <> pkcs8 <> cert) $ Char8.lines bs
     mapM_ (putStrLn . addy . torhash) keys
 
     
-- 
cgit v1.2.3