1 files changed, 14 insertions, 8 deletions

diff --git a/lib/Kiki.hs b/lib/Kiki.hs
index 64dc2bd..258892f 100644
--- a/lib/Kiki.hs
+++ b/lib/Kiki.hs
@@ -49,6 +49,7 @@ import           DotLock
 import           GnuPGAgent                 (Query (..))
 import           KeyRing hiding (pemFromPacket)
 import           KeyDB
+import           KeyRing.BuildKeyDB (gpgipv6addr, Hostnames, allNames)
 
 withAgent :: [PassphraseSpec] -> [PassphraseSpec]
 withAgent [] = [PassphraseAgent]
@@ -448,9 +449,6 @@ generateHostsFile fw rt      = do
     KikiResult _ report <- runKeyRing op
     outputReport report
 
-allNames :: Hostnames -> [Char8.ByteString]
-allNames (Hostnames _ ns os cs) = ns ++ os ++ (maybe [] return cs)
-
 getSshKnownHosts :: Peer -> Char8.ByteString
 getSshKnownHosts peer@Peer{kd} = Char8.unlines taggedblobs
   where
@@ -496,7 +494,7 @@ installIpsecConf fw MyIdentity{myGpgAddress} cs = do
 getMyIdentity :: KeyRingRuntime -> Maybe MyIdentity
 getMyIdentity rt = do
     wk <- rtWorkingKey rt
-    Hostnames wkaddr _ _ _ <- getHostnames <$> lookupKeyData (keykey wk) (rtKeyDB rt)
+    wkaddr <- gpgipv6addr . getHostnames <$> lookupKeyData (keykey wk) (rtKeyDB rt)
     return $ MyIdentity wkaddr (show $ fingerprint wk)
 
 refreshCache :: KeyRingRuntime -> Maybe FilePath -> IO ()
@@ -734,16 +732,24 @@ verifyFile isHomeless cap keyrings filename = do
                     Right sigs -> do
                         let over = DataSignature lit sigs
                             lit = LiteralDataPacket
-                                    { format    = error "format" :: Char
+                                    { format    = error "format" :: Char -- TODO
                                     , filename  = filename
-                                    , timestamp = error "timestamp" :: Word32
-                                    , content   = bs
+                                    , timestamp = error "timestamp" :: Word32 -- TODO
+                                    , content   = txt
                                     }
                             -- TODO: Remove this take 1 after optimizing 'candidateSignerKeys'
                             tentativeTake1 xs = take 1 xs
                             keys = concatMap (candidateSignerKeys (rtKeyDB rt)) $ tentativeTake1 sigs
                             good = verify (Message keys) over
-                        putStrLn $ "verifyFile: " ++ show (length $ signatures_over good)
+                        putStrLn $ unwords
+                            [ "verifyFile:"
+                            , show (length $ signatures_over good)
+                            , "good of"
+                            , show (length $ signatures_over over)
+                            , "signatures."
+                            ]
+                        -- when (null (signatures_over good)) $ do
+                        --    L.putStrLn txt
                     rs -> do
                         hPutStrLn stderr $ show rs
             _ -> do