1 files changed, 28 insertions, 4 deletions

diff --git a/kiki.hs b/kiki.hs
index fef214c..e6e0630 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -1213,6 +1213,17 @@ show_all db = do
     let Message packets = flattenKeys True db
     putStrLn $ listKeys packets
 
+show_pem keyspec wkgrip db = do
+    let s = parseSpec wkgrip keyspec
+    flip (maybe $ warn (keyspec ++ ": not found") >> return ())
+         (selectKey s db)
+         $ \k -> do
+    let rsa = pkcs8 . fromJust $ rsaKeyFromPacket k
+        der = encodeASN1 DER (toASN1 rsa [])
+        qq  = Base64.encode (L.unpack der)
+    putStrLn $
+        writePEM "PUBLIC KEY" qq -- ("TODO "++show keyspec)
+
 parseSpec :: String -> String -> (KeySpec,Maybe String)
 parseSpec grip spec = (topspec,subspec)
  where
@@ -1506,6 +1517,7 @@ main = do
                                             , ("--autosign",0)
                                             , ("--show-wk",0)
                                             , ("--show-all",0)
+                                            , ("--show-pem",1)
                                             ]
                                             args
                           args' = if map (take 1) (take 1 vargs) == ["-"]
@@ -1605,11 +1617,12 @@ main = do
 
         flip (maybe $ return ()) ret_db . const $ do
             -- On last pass, interpret --show-* commands.
-            let shspec = Map.fromList [("--show-wk", show_wk secfile grip)
-                                      ,("--show-all",show_all    )]
-                shargs = mapMaybe (\x -> listToMaybe x >>= \x ->Map.lookup x shspec) sargs
+            let shspec = Map.fromList [("--show-wk", const $ show_wk secfile grip)
+                                      ,("--show-all",const $ show_all)
+                                      ,("--show-pem",\[x] -> show_pem x $ maybe "" id grip) ]
+                shargs = mapMaybe (\(x:xs) -> (,xs) <$> Map.lookup x shspec) sargs
 
-            forM_ shargs $ \cmd -> cmd use_db
+            forM_ shargs $ \(cmd,args) -> cmd args use_db
         return $ ret_db
 
     return()
@@ -2159,6 +2172,17 @@ isTopKey _ = False
 filterMatches :: KeySpec -> [(KeyKey,KeyData)] -> [(KeyKey,KeyData)]
 filterMatches spec ks = filter (matchSpec spec) ks
 
+selectKey :: (KeySpec,Maybe String) -> KeyDB -> Maybe Packet
+selectKey (spec,mtag) db = do
+    -- Note: Because of the behavior of flattenKeys,
+    --       selectKey cannot return a SecretKeyPacket
+    let Message ps = flattenKeys True db
+        ys = snd $ seek_key spec ps
+    flip (maybe (listToMaybe ys)) mtag $ \tag -> do
+    let (subspec,ys1) = (KeyTag y tag,ys1) where y:ys1 = ys
+        zs = snd $ seek_key subspec ys1
+    listToMaybe zs
+
 matchSpec (KeyGrip grip) (_,KeyData p _ _ _) 
     | matchpr grip (packet p)==grip = True
     | otherwise                     = False