1 files changed, 24 insertions, 9 deletions

diff --git a/lib/KeyRing.hs b/lib/KeyRing.hs
index bb8b598..fc21122 100644
--- a/lib/KeyRing.hs
+++ b/lib/KeyRing.hs
@@ -17,10 +17,11 @@
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE ViewPatterns #-}
+{-# LANGUAGE PatternGuards #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE DeriveFunctor #-}
 {-# LANGUAGE DoAndIfThenElse #-}
-{-# LANGUAGE NoPatternGuards #-}
+{-# LANGUAGE PatternGuards #-}
 {-# LANGUAGE ForeignFunctionInterface #-}
 module KeyRing
     (
@@ -347,8 +348,8 @@ spillable (spill -> KF_None) = False
 spillable _                  = True
 
 isMutable :: StreamInfo -> Bool
-isMutable (fill -> KF_None) = False
-isMutable _                 = True
+isMutable stream | KF_None <- fill stream = False
+isMutable _                               = True
 
 isring :: FileType -> Bool
 isring (KeyRingFile {}) = True
@@ -1411,9 +1412,9 @@ writeHostsFiles
      -> IO [(FilePath, KikiReportAction)]
 writeHostsFiles krd ctx (hostdbs0,hostdbs,u1,gpgnames,outgoing_names) = do
     let hns = files isMutableHosts
-        isMutableHosts (fill -> KF_None) = False
-        isMutableHosts (typ -> Hosts)    = True
-        isMutableHosts _                 = False
+        isMutableHosts stream | KF_None <- fill stream = False
+        isMutableHosts stream | Hosts <- typ stream    = True
+        isMutableHosts _                               = False
         files istyp = do
             (f,stream) <- Map.toList (opFiles krd)
             guard (istyp stream)
@@ -2011,9 +2012,9 @@ writeWalletKeys :: KeyRingOperation -> KeyDB -> Maybe Packet -> IO (KikiConditio
 writeWalletKeys krd db wk = do
     let cs = db `coinKeysOwnedBy` wk
     -- export wallet keys
-        isMutableWallet (fill -> KF_None)      = False
-        isMutableWallet (typ -> WalletFile {}) = True
-        isMutableWallet _                      = False
+        isMutableWallet stream | KF_None <- fill stream      = False
+        isMutableWallet stream | WalletFile {} <- typ stream = True
+        isMutableWallet _                                    = False
         files pred = do
             (f,stream) <- Map.toList (opFiles krd)
             guard (pred stream)
@@ -3080,6 +3081,20 @@ findTag tag topk subkey subsigs = (xs',minsig,ys')
                 return ( null $ tag \\ hshed, sig)
 
 mkUsage :: String -> SignatureSubpacket
+mkUsage tag | Just flags <- lookup tag specials
+  = KeyFlagsPacket
+        { certify_keys          = fromEnum flags .&. 0x1 /= 0
+        , sign_data             = fromEnum flags .&. 0x2 /= 0
+        , encrypt_communication = fromEnum flags .&. 0x4 /= 0
+        , encrypt_storage       = fromEnum flags .&. 0x8 /= 0
+        , split_key             = False
+        , authentication        = False
+        , group_key             = False
+        }
+ where
+    flagsets = [Special .. VouchSignEncrypt]
+    specials = map (\f -> (usageString f, f)) flagsets
+
 mkUsage tag = NotationDataPacket
                 { human_readable = True
                 , notation_name = "usage@"