updated kiki.hs to use new pem parser

1 files changed, 17 insertions, 21 deletions

diff --git a/kiki.hs b/kiki.hs
index c8adb51..e992087 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -43,7 +43,8 @@ import Data.Time.Clock.POSIX ( utcTimeToPOSIXSeconds )
 import Data.Time.Clock ( UTCTime )
 import Data.Monoid ( (<>) )
 
-
+import ScanningParser
+import PEM
 import DotLock
 import LengthPrefixedBE
 import KeyRing
@@ -324,12 +325,6 @@ show_wip keyspec wkgrip db = do
     let nwb = maybe 0x80 CryptoCoins.secretByteFromName $ snd s
     putStrLn $ walletImportFormat nwb k
 
-getSequence depth (Start Sequence:xs) = Start Sequence : getSequence (depth+1) xs
-getSequence 1     (End Sequence:_)  = [End Sequence]
-getSequence depth (End Sequence:xs) = End Sequence : getSequence (depth-1) xs
-getSequence depth (x:xs) = x : getSequence depth xs
-getSequence _ [] = []
-
 packetFromPublicRSAKey notBefore n e =
     PublicKeyPacket { version = 4
                     , timestamp = round $ utcTimeToPOSIXSeconds notBefore
@@ -352,7 +347,7 @@ parseCertBlob comp bs = do
     let asn1' = drop 2 asn1
     cert <- either (const Nothing) (Just . fst) (fromASN1 asn1')
     let _ = cert :: Certificate
-        (notBefore,notAfter) = certValidity cert
+        (notBefore,_) = certValidity cert
     case certPubKey cert of
         PubKeyRSA key -> do
             let withoutkey =
@@ -388,9 +383,6 @@ decodeBlob cert =
     bs = pcertBlob cert
     key = maybe L.empty (encodeASN1 DER . flip toASN1 []) $ rsaKeyFromPacket $ pcertKey cert
 
-parsePEM :: L.ByteString -> L.ByteString -> (Message,L.ByteString)
-parsePEM hdr bs = error "todo"
-
 show_torhash pubkey _ = do
     bs <- Char8.readFile pubkey 
     let parsekey f dta  = do
@@ -398,24 +390,28 @@ show_torhash pubkey _ = do
             e <- decodeASN1 DER <$> mdta
             asn1 <- either (const Nothing) (Just) e
             k <- either (const Nothing) (Just . fst) (fromASN1 asn1)
-            return $ f (packetFromPublicRSAKey undefined) k -- (MPI n) (MPI e)
-        pkcs1 = parsekey (\f (RSAKey n e) -> f n e)
-                $ extractPEM "RSA PUBLIC KEY" bs
-        pkcs8 = parsekey (\f (RSAKey8 n e) -> f n e)
-                $ extractPEM "PUBLIC KEY" bs
+            return $ f (packetFromPublicRSAKey undefined) k
         addy hsh = take 16 hsh ++ ".onion " ++ hsh
-    putStrLn $ maybe "" (addy . torhash) $ mplus pkcs1 pkcs8
+        pkcs1 = fmap ( parsekey (\f (RSAKey n e)  -> f n e) . pemBlob )
+                     $ 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
+    mapM_ (putStrLn . addy . torhash) keys
+
     
 show_cert certfile _ = do
     bs <- Char8.readFile certfile
-    let dta = extractPEM "CERTIFICATE" bs
-        mdta = L.pack <$> Base64.decode (Char8.unpack dta)
+    let dta = scanAndParse (fmap pemBlob $ pemParser $ Just "CERTIFICATE") $ Char8.lines bs
+        mdta = do
+            dta <- listToMaybe dta
+            L.pack <$> Base64.decode (Char8.unpack dta)
     let c = mdta >>= parseCertBlob True
         d = mdta >>= parseCertBlob False
         -- e = mdta >>= parseCertBlob 2
-        b64 = Base64.encode . S.unpack
+        -- b64 = Base64.encode . S.unpack
         b64L = Base64.encode . L.unpack
-        hex = Base16.encode . S.unpack
+        -- hex = Base16.encode . S.unpack
         hexL = Base16.encode . L.unpack
     putStrLn $ maybe "" (fingerprint . pcertKey) c
     putStrLn $ maybe "" (torhash . pcertKey) c