1 files changed, 6 insertions, 3 deletions

diff --git a/kiki.hs b/kiki.hs
index 03ea635..d4d4084 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -335,12 +335,15 @@ show_wip keyspec wkgrip db = do
 show_torhash :: FilePath -> p -> IO ()
 show_torhash pubkey _ = do
     bs <- Char8.readFile pubkey
-    let parsekey f dta  = do
+    let -- parsekey :: ((MPI -> MPI -> Packet) -> _ -> b) -> Char8.ByteString -> Maybe b
+        parsekey f dta  = do
             let mdta = fmap L.fromStrict $ functorToMaybe $ convertFromBase Base64 (Char8.toStrict dta)
             e <- decodeASN1 DER <$> mdta
             asn1 <- either (const Nothing) (Just) e
             k <- either (const Nothing) (Just . fst) (fromASN1 asn1)
-            return $ f (packetFromPublicRSAKey undefined) k
+            return $ f (packetFromPublicRSAKey pgpver (error "torhash timestmap?")) k
+
+        pgpver = 4 :: Word8
 
         addy :: String -> String
         addy hsh = take 16 hsh ++ ".onion " ++ hsh
@@ -348,7 +351,7 @@ show_torhash pubkey _ = do
                      $ pemParser (Just "RSA PUBLIC KEY")
         pkcs8 = fmap ( parsekey (\f (RSAKey8 n e) -> f n e) . pemBlob )
                      $ pemParser (Just "PUBLIC KEY")
-        cert = fmap (fmap pcertKey . parseCertBlob False . pemBlob)
+        cert = fmap (fmap pcertKey . parseCertBlob pgpver False . pemBlob)
                      $ pemParser (Just "CERTIFICATE")
         keys = catMaybes $ scanAndParse (pkcs1 <> pkcs8 <> cert) $ Char8.lines bs
     mapM_ (putStrLn . addy . torhash) keys