From 0aebedadd392e495ffc8f7c2fa74d712f16c2d7d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 4 May 2017 14:02:37 -0400 Subject: include gpg public key export in GpgSigned This makes debug-me not rely on the gpg keyservers at all. Before, it was only working when the user had the developer's public key already. I thought that --verify would download from --keyserver, but seems not. This is a protocol breaking change! Luckily done before any release, so ok. ProtocolBuffers renumbered. This commit was sponsored by Denis Dzyubenko on Patreon. --- ControlWindow.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ControlWindow.hs') diff --git a/ControlWindow.hs b/ControlWindow.hs index a91adc0..c921fbb 100644 --- a/ControlWindow.hs +++ b/ControlWindow.hs @@ -135,10 +135,10 @@ displayChatMessage _ = return () askToAllow :: TMChan ControlOutput -> PromptChan -> ResponseChan -> PerhapsSigned PublicKey -> IO () askToAllow ochan _ _ (UnSigned pk) = atomically $ writeTMChan ochan $ ControlOutputAction $ SessionKeyRejected pk -askToAllow ochan promptchan responsechan k@(GpgSigned pk _) = do +askToAllow ochan promptchan responsechan k@(GpgSigned pk _ _) = do putStrLn "Someone wants to connect to this debug-me session." putStrLn "Checking their GnuPG signature ..." - v <- gpgVerify [] k + v <- gpgVerify k case v of Nothing -> do putStrLn "Unable to download their GnuPG key, or signature verification failed." -- cgit v1.2.3