diff options
Diffstat (limited to 'Role')
| -rw-r--r-- | Role/Developer.hs | 8 | ||||
| -rw-r--r-- | Role/User.hs | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Role/Developer.hs b/Role/Developer.hs index 2cc6c1c..2cdf917 100644 --- a/Role/Developer.hs +++ b/Role/Developer.hs @@ -230,7 +230,9 @@ authUser spk ichan ochan devstate logger = do atomically $ writeTMChan ichan msg logger $ Developer msg waitresp $ case spk of - GpgSigned pk _ -> pk + -- Don't bother verifying the user's gpg public key; + -- normally users send UnSigned. + GpgSigned pk _ _ -> pk UnSigned pk -> pk where waitresp pk = do @@ -291,7 +293,7 @@ getServerMessage ochan devstate ts = do -- When other developers connect, learn their SessionKeys. process (Developer msg@(ControlMessage (Control (SessionKey spk) _))) = do let sigverifier = mkSigVerifier $ case spk of - GpgSigned pk _ -> pk + GpgSigned pk _ _ -> pk UnSigned pk -> pk if verifySigned sigverifier msg then do @@ -421,7 +423,7 @@ processSessionStart sk ochan logger dsv = do sigverifier <- case sessionmsg of User (ControlMessage c@(Control (SessionKey spk) _)) -> do let pk = case spk of - GpgSigned k _ -> k + GpgSigned k _ _ -> k UnSigned k -> k let sv = mkSigVerifier pk if verifySigned sv c diff --git a/Role/User.hs b/Role/User.hs index 49e9edf..6c6fb39 100644 --- a/Role/User.hs +++ b/Role/User.hs @@ -250,7 +250,7 @@ getDeveloperMessage' (MissingHashes wiremsg) ochan us now = do case msg of ControlMessage (Control (SessionKey spk) _) -> do let sigverifier = mkSigVerifier $ case spk of - GpgSigned pk _ -> pk + GpgSigned pk _ _ -> pk UnSigned pk -> pk if verifySigned sigverifier msg then return (InputMessage msg) |