show --cert, certificate import bug fixes

1 files changed, 22 insertions, 2 deletions

diff --git a/kiki.hs b/kiki.hs
index 063c42c..f1568aa 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -39,7 +39,7 @@ import Data.Binary.Put (putWord32be,runPut,putByteString)
 import Data.X509 -- (Certificate,SignedCertificate, decodeSignedObject, decodeSignedCertificate )
 import Crypto.PubKey.RSA as RSA
 import qualified Codec.Compression.GZip as GZip
-import Data.Time.Clock.POSIX ( utcTimeToPOSIXSeconds )
+import Data.Time.Clock.POSIX ( utcTimeToPOSIXSeconds, posixSecondsToUTCTime )
 import Data.Time.Clock ( UTCTime )
 import Data.Monoid ( (<>) )
 
@@ -343,7 +343,26 @@ show_torhash pubkey _ = do
         keys = catMaybes $ scanAndParse (pkcs1 <> pkcs8 <> cert) $ Char8.lines bs
     mapM_ (putStrLn . addy . torhash) keys
 
+show_cert keyspec wkgrip db = do
+    let s = parseSpec wkgrip keyspec
+    putStrLn $ "parsed spec: "++show s
+    case selectPublicKeyAndSigs s db of
+        [] -> void $ warn (keyspec ++ ": not found")
+        [(k,sigs)] -> do
+            {-
+            let rsa = pkcs8 . fromJust $ rsaKeyFromPacket k
+                der = encodeASN1 DER (toASN1 rsa [])
+                qq  = Base64.encode (L.unpack der)
+            putStrLn $ writePEM "PUBLIC KEY (TODO: CERT)" qq -- ("TODO "++show keyspec)
+            -}
+            let cs = mapMaybe x509cert $ (sigs >>= hashed_subpackets)
+                ds = map decodeBlob $ map (ParsedCert k (posixSecondsToUTCTime $ fromIntegral $ timestamp k)) cs
+                qqs = map (Base64.encode . L.unpack) ds
+                pems = map (writePEM "CERTIFICATE") qqs
+            forM_ pems putStrLn
+        _ -> void $ warn (keyspec ++ ": ambiguous")
     
+{-
 show_cert certfile _ = do
     bs <- Char8.readFile certfile
     let dta = scanAndParse (fmap pemBlob $ pemParser $ Just "CERTIFICATE") $ Char8.lines bs
@@ -385,6 +404,7 @@ show_cert certfile _ = do
     putStrLn ""
     putStrLn $ "prefix = " ++ hexL v
     return ()
+-}
 
 cannonical_eckey x y = 0x4:pad32(numToBytes x) ++ pad32(numToBytes y) :: [Word8]
  where
@@ -935,7 +955,7 @@ kiki "show" args = do
                                       ,("--pem",\[x] -> show_pem x $ fromMaybe "" grip)
                                       ,("--ssh",\[x] -> show_ssh x $ fromMaybe "" grip)
                                       ,("--wip",\[x] -> show_wip x $ fromMaybe "" grip)
-                                      ,("--cert",\[x] -> show_cert x)
+                                      ,("--cert",\[x] -> show_cert x $ fromMaybe "" grip)
                                       ,("--torhash",\[x] -> show_torhash x)
                                       ]
                 shargs = mapMaybe (\(x:xs) -> (,xs) <$> Map.lookup x shspec) sargs