1 files changed, 36 insertions, 35 deletions

diff --git a/lib/Transforms.hs b/lib/Transforms.hs
index adb7830..8eaa482 100644
--- a/lib/Transforms.hs
+++ b/lib/Transforms.hs
@@ -56,37 +56,34 @@ data SubKey = SubKey MappedPacket [SigAndTrust] deriving Show
 
 -- | This is a GPG Identity which includes a master key and all its UIDs and
 -- subkeys and associated signatures.
-data KeyData = KeyData { keyMappedPacket :: MappedPacket    -- main key
-                       , keySigAndTrusts :: [SigAndTrust]  -- sigs on main key
-                       , keyUids :: (Map.Map String ([SigAndTrust],OriginMap))  -- uids
-                       , keySubKeys :: (Map.Map KeyKey SubKey)    -- subkeys
-                       } deriving Show
+data KeyData = KeyData
+    { keyMappedPacket :: MappedPacket                               -- main key
+    , keySigAndTrusts :: [SigAndTrust]                              -- sigs on main key
+    , keyUids         :: (Map.Map String ([SigAndTrust],OriginMap)) -- uids
+    , keySubKeys      :: (Map.Map KeyKey SubKey)                    -- subkeys
+    } deriving Show
 type KeyDB = Map.Map KeyKey KeyData
 
 
 
 data KeyRingRuntime = KeyRingRuntime
-                        { rtPubring :: FilePath
-                        -- ^ Path to the file represented by 'HomePub'
-                        , rtSecring :: FilePath
-                        -- ^ Path to the file represented by 'HomeSec'
-                        , rtGrip :: Maybe String
-                        -- ^ Fingerprint or portion of a fingerprint used
-                        -- to identify the working GnuPG identity used to
-                        -- make signatures.
-                        , rtWorkingKey :: Maybe Packet
-                        -- ^ The master key of the working GnuPG identity.
-                        , rtKeyDB :: KeyDB
-                        -- ^ The common information pool where files spilled
-                        -- their content and from which they received new
-                        -- content.
-                        , rtRingAccess :: Map.Map InputFile Access
-                        -- ^ The 'Access' values used for files of type
-                        -- 'KeyRingFile'.  If 'AutoAccess' was specified
-                        -- for a file, this 'Map.Map' will indicate the
-                        -- detected value that was used by the algorithm.
-                        , rtPassphrases :: PacketTranscoder
-                        }
+    { rtPubring :: FilePath -- ^ Path to the file represented by 'HomePub'
+    , rtSecring :: FilePath -- ^ Path to the file represented by 'HomeSec'
+    , rtGrip    :: Maybe String
+                            -- ^ Fingerprint or portion of a fingerprint used
+                            -- to identify the working GnuPG identity used to
+                            -- make signatures.
+    , rtWorkingKey :: Maybe Packet -- ^ The master key of the working GnuPG identity.
+    , rtKeyDB      :: KeyDB -- ^ The common information pool where files spilled
+                            -- their content and from which they received new
+                            -- content.
+    , rtRingAccess :: Map.Map InputFile Access
+                            -- ^ The 'Access' values used for files of type
+                            -- 'KeyRingFile'.  If 'AutoAccess' was specified
+                            -- for a file, this 'Map.Map' will indicate the
+                            -- detected value that was used by the algorithm.
+    , rtPassphrases :: PacketTranscoder
+    }
 
 
 -- | Roster-entry level actions
@@ -140,9 +137,9 @@ data KikiReportAction =
 type KikiReport = [ (FilePath, KikiReportAction) ]
 
 data UserIDRecord = UserIDRecord {
-    uid_full :: String,
-    uid_realname :: T.Text,
-    uid_user :: T.Text,
+    uid_full      :: String,
+    uid_realname  :: T.Text,
+    uid_user      :: T.Text,
     uid_subdomain :: T.Text,
     uid_topdomain :: T.Text
 }
@@ -780,6 +777,9 @@ makeSig doDecrypt top fname subkey_p tags mbsig = do
 
 
 
+-- TODO: Use fingerprint to narrow candidates.
+candidateSignerKeys :: KeyDB -> Packet -> [Packet]
+candidateSignerKeys db sig = map keyPacket $ Map.elems db
 
 performManipulations ::
                 (PacketDecrypter)
@@ -812,8 +812,8 @@ performManipulations doDecrypt rt wk manip = do
             selfsigs = filter (\(sig,v,whosign) -> isJust (v >> Just wkun >>= guard
                                    . (== keykey whosign)
                                    . keykey)) vs
-            keys = map keyPacket $ Map.elems (rtKeyDB rt)
-            overs sig = signatures $ Message (keys++[keyPacket kd,UserIDPacket uid,sig])
+            keys = map keyPacket $ Map.elems (rtKeyDB rt) -- TODO candidateSignerKeys (rtKeyDB rt) sig
+            overs sig = signatures $ Message (keys ++ [keyPacket kd,UserIDPacket uid,sig])
             vs :: [ ( Packet -- signature
                    , Maybe SignatureOver -- Nothing means non-verified
                    , Packet ) -- key who signed
@@ -822,10 +822,11 @@ performManipulations doDecrypt rt wk manip = do
                    x <- maybeToList $ Map.lookup uid (keyUids kd)
                    sig <- map (packet . fst) (fst x)
                    o <- overs sig
-                   k <- keys
-                   let ov = verify (Message [k]) $ o
-                   signatures_over ov
-                   return (sig,Just ov,k)
+                   take 1 $ do -- Stop attempting to verify after the first success.
+                       k <- keys
+                       let ov = verify (Message [k]) $ o
+                       signatures_over ov
+                       return (sig,Just ov,k)
             additional new_sig = do
                 new_sig <- maybeToList new_sig
                 guard (null $ selfsigs)