Attempted to merge 0bc53f99cfd70f3a18802604d7ef3174d004db4c.

I left lib/Kiki.hs out for later.

1 files changed, 23 insertions, 22 deletions

diff --git a/lib/Transforms.hs b/lib/Transforms.hs
index 990a5b4..c83f427 100644
--- a/lib/Transforms.hs
+++ b/lib/Transforms.hs
@@ -16,7 +16,7 @@ import Data.Ord
 import Data.OpenPGP
 import Data.OpenPGP.Util
 import Data.Word
-import Types
+import KeyRing.Types
 import FunctorToMaybe
 import GnuPGAgent ( key_nbits )
 import PacketTranscoder
@@ -257,10 +257,9 @@ mkUsage tag | Just flags <- lookup tag specials
  where
     flagsets = [Special .. VouchSignEncrypt]
     specials = map (\f -> (usageString f, f)) flagsets
-
 mkUsage tag = NotationDataPacket
                 { human_readable = True
-                , notation_name = "usage@"
+                , notation_name  = "usage@"
                 , notation_value = tag
                 }
 
@@ -278,6 +277,7 @@ unsig fname isPublic (sig,trustmap) =
     asMapped n p = let m = mappedPacket fname p
                    in m { locations = fmap (\x->x {originalNum=n}) (locations m) }
 
+smallpr :: Packet -> [Char]
 smallpr k = drop 24 $ fingerprint k
 
 backsig :: SignatureSubpacket -> Maybe Packet
@@ -285,16 +285,19 @@ backsig (EmbeddedSignaturePacket s) = Just s
 backsig _                           = Nothing
 
 
+isSubkeySignature :: SignatureOver -> Bool
 isSubkeySignature (SubkeySignature {}) = True
 isSubkeySignature _                    = False
 
 
+has_tag :: String -> Packet -> Bool
 has_tag tag p = isSignaturePacket p
                     && or [ tag `elem` mapMaybe usage (hashed_subpackets p)
                           , tag `elem` map usageString (mapMaybe keyflags (hashed_subpackets p)) ]
 
 
 
+verifyBindings :: [Packet] -> [Packet] -> ([SignatureOver], [SignatureOver])
 verifyBindings keys nonkeys = (top ++ filter isSubkeySignature embedded,othersigs)
  where
     verified = do
@@ -317,7 +320,7 @@ verifyBindings keys nonkeys = (top ++ filter isSubkeySignature embedded,othersig
         guard (not . null $ signatures_over v)
         return v
 
-
+disjoint_fp :: [Packet] -> [[Packet]]
 disjoint_fp ks = {- concatMap group2 $ -} transpose grouped
  where
     grouped    = groupBy samepr . sortBy (comparing smallpr) $ ks
@@ -474,22 +477,22 @@ uidkey (UserIDPacket str) = str
 usageString :: PGPKeyFlags -> String
 usageString flgs =
  case flgs of
-    Special -> "special"
-    Vouch -> "vouch" -- signkey
-    Sign -> "sign"
-    VouchSign -> "vouch-sign"
-    Communication -> "communication"
-    VouchCommunication -> "vouch-communication"
-    SignCommunication -> "sign-communication"
+    Special                -> "special"
+    Vouch                  -> "vouch" -- signkey
+    Sign                   -> "sign"
+    VouchSign              -> "vouch-sign"
+    Communication          -> "communication"
+    VouchCommunication     -> "vouch-communication"
+    SignCommunication      -> "sign-communication"
     VouchSignCommunication -> "vouch-sign-communication"
-    Storage -> "storage"
-    VouchStorage -> "vouch-storage"
-    SignStorage -> "sign-storage"
-    VouchSignStorage -> "vouch-sign-storage"
-    Encrypt -> "encrypt"
-    VouchEncrypt -> "vouch-encrypt"
-    SignEncrypt -> "sign-encrypt"
-    VouchSignEncrypt -> "vouch-sign-encrypt"
+    Storage                -> "storage"
+    VouchStorage           -> "vouch-storage"
+    SignStorage            -> "sign-storage"
+    VouchSignStorage       -> "vouch-sign-storage"
+    Encrypt                -> "encrypt"
+    VouchEncrypt           -> "vouch-encrypt"
+    SignEncrypt            -> "sign-encrypt"
+    VouchSignEncrypt       -> "vouch-sign-encrypt"
 
 
 
@@ -529,7 +532,7 @@ showPacket p | isKey p   = (if is_subkey p
         flags = mapMaybe (fmap usageString . keyflags) xs
         xs = hashed_subpackets p
 
-
+showPacket0 :: Show a => a -> [Char]
 showPacket0 p = dropSuffix "Packet" . concat . take 1 $ words (show p)
  where
     dropSuffix :: String -> String -> String
@@ -588,7 +591,6 @@ keyFlags0 wkun uidsigs = concat
                       , preferredhash
                       , preferredcomp
                       , features ]
-
  where
     subs = concatMap hashed_subpackets uidsigs
     keyflags = filterOr isflags subs $
@@ -650,7 +652,6 @@ rsaKeyFromPacket p | isKey p = do
     n <- lookup 'n' $ key p
     e <- lookup 'e' $ key p
     return $ RSAKey n e
-
 rsaKeyFromPacket _ = Nothing