cokiki build fix & show --packets option.

1 files changed, 21 insertions, 3 deletions

diff --git a/lib/KeyRing.hs b/lib/KeyRing.hs
index 8a23ff9..84d484d 100644
--- a/lib/KeyRing.hs
+++ b/lib/KeyRing.hs
@@ -114,6 +114,7 @@ module KeyRing
     , resolveForReport
     , KeyKey -- needed for Type sigs
     , makeMemoizingDecrypter
+    , showPacket
     ) where
 
 import System.Environment
@@ -1983,9 +1984,26 @@ showPacket :: Packet -> String
 showPacket p | isKey p   = (if is_subkey p
                               then showPacket0 p
                               else ifSecret p "----Secret-----" "----Public-----")
-                           ++ " "++show (key_algorithm p)++" "++fingerprint p
-             | isUserID p = showPacket0 p ++ " " ++ show (uidkey p)
-             | otherwise = showPacket0 p
+                           ++ " "++fingerprint p
+                           ++ " "++show (key_algorithm p)
+                           ++ case key_nbits p of { 0 -> ""; n -> "("++show n++")" }
+             | isUserID p          = showPacket0 p ++ " " ++ show (uidkey p)
+             -- | isSignaturePacket p = showPacket0 p ++ maybe "" ((++) (" ^ signed"++sigusage p++": ")) (signature_issuer p)
+             | isSignaturePacket p = showPacket0 p ++ maybe "" (" ^ signed: "++) (signature_issuer p) ++ sigusage p
+             | otherwise           = showPacket0 p
+ where
+    sigusage p =
+        case take 1 (tagStrings p) of
+            []    -> ""
+            tag:_ -> " "++show tag -- "("++tag++")"
+     where
+        tagStrings p = usage_tags ++ flags
+         where
+            usage_tags = mapMaybe usage xs
+            flags = mapMaybe (fmap usageString . keyflags) xs
+            xs = hashed_subpackets p
+
+
 showPacket0 p = concat . take 1 $ words (show p)