From f72cf2344c4f7486a1a7a12a423ec85e5cb4b539 Mon Sep 17 00:00:00 2001 From: Joe Crayne Date: Sun, 13 Oct 2019 05:30:42 -0400 Subject: Fixed clear-sign verify. New customized dependency openpgp-asciiarmor. --- lib/Kiki.hs | 16 ++++++++++++---- stack.yaml | 3 ++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/lib/Kiki.hs b/lib/Kiki.hs index 7825c85..258892f 100644 --- a/lib/Kiki.hs +++ b/lib/Kiki.hs @@ -732,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 diff --git a/stack.yaml b/stack.yaml index 2a1cc19..6cdb54c 100644 --- a/stack.yaml +++ b/stack.yaml @@ -5,4 +5,5 @@ extra-deps: # - ../openpgp-util - git: d@cryptonomic.net:public_git/openpgp-util.git commit: bb3a9e181638fa881e2bcd8425f10cfb365533f5 - +- git: d@cryptonomic.net:public_git/openpgp-asciiarmor.git + commit: 9694b1b6ae3763c44d3b1361b5faa0a7b27e77a9 -- cgit v1.2.3