1 files changed, 8 insertions, 8 deletions

diff --git a/lib/Transforms.hs b/lib/Transforms.hs
index edc18bb..7750ec5 100644
--- a/lib/Transforms.hs
+++ b/lib/Transforms.hs
@@ -664,7 +664,7 @@ performManipulations doDecrypt rt wk manip = do
                    , Packet ) -- key who signed
                  ]
             vs = do
-                   x <- maybeToList $ Map.lookup uid (keyUids kd)
+                   x <- maybeToList $ Map.lookup (UidString uid) (keyUids kd)
                    sig <- map (packet . fst) (fst x)
                    o <- overs sig
                    take 1 $ do -- Stop attempting to verify after the first success.
@@ -681,7 +681,7 @@ performManipulations doDecrypt rt wk manip = do
             f x = ( map ( (,Map.empty) . toMappedPacket om) (additional sigr) ++ fst x
                   , om `Map.union` snd x )
         -- XXX: Shouldn't this signature generation show up in the KikiReport ?
-        return $ KikiSuccess $ ( kd { keyUids = Map.adjust f uid (keyUids kd) }, report )
+        return $ KikiSuccess $ ( kd { keyUids = Map.adjust f (UidString uid) (keyUids kd) }, report )
 
     perform (kd,report) (SubKeyDeletion topk subk) = do
         let kk = keykey $ packet $ keyMappedPacket kd
@@ -755,13 +755,13 @@ parseUID str = UserIDRecord {
 resolveTransform :: Transform -> KeyRingRuntime -> KeyData -> [PacketUpdate]
 resolveTransform Autosign rt kd@(KeyData k ksigs umap submap) = ops
  where
-    ops = map (\u -> InducerSignature u []) us
+    ops = map (\(UidString u) -> InducerSignature u []) us
     us = filter torStyle $ Map.keys umap
-    torStyle str = and [ uid_topdomain parsed == "onion"
-                        , uid_realname parsed `elem` ["","Anonymous"]
-                        , uid_user parsed == "root"
-                        , fmap (match . fst) (lookup (packet k) torbindings)
-                            == Just True ]
+    torStyle (UidString str) = and [ uid_topdomain parsed == "onion"
+                                    , uid_realname parsed `elem` ["","Anonymous"]
+                                    , uid_user parsed == "root"
+                                    , fmap (match . fst) (lookup (packet k) torbindings)
+                                        == Just True ]
       where parsed = parseUID str
             match =  (==subdom) . take (fromIntegral len)
             subdom0 = L.fromChunks [encodeUtf8 (uid_subdomain parsed)]