diff options
Diffstat (limited to 'Role/Developer.hs')
| -rw-r--r-- | Role/Developer.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Role/Developer.hs b/Role/Developer.hs index 2cdf917..d706a7a 100644 --- a/Role/Developer.hs +++ b/Role/Developer.hs @@ -226,7 +226,7 @@ authUser :: PerhapsSigned PublicKey -> TMChan (Message Entered) -> TMChan (Missi authUser spk ichan ochan devstate logger = do ds <- atomically $ readTVar devstate let msg = ControlMessage $ mkSigned (developerSessionKey ds) - (Control (SessionKey spk)) + (Control (SessionKey spk currentProtocolVersion)) atomically $ writeTMChan ichan msg logger $ Developer msg waitresp $ case spk of @@ -291,7 +291,7 @@ getServerMessage ochan devstate ts = do return (Just (o, User msg)) else return $ Just (ProtocolError ds $ "Bad signature on message from user: " ++ show msg, User msg) -- When other developers connect, learn their SessionKeys. - process (Developer msg@(ControlMessage (Control (SessionKey spk) _))) = do + process (Developer msg@(ControlMessage (Control (SessionKey spk _) _))) = do let sigverifier = mkSigVerifier $ case spk of GpgSigned pk _ _ -> pk UnSigned pk -> pk @@ -334,7 +334,7 @@ getServerMessage ochan devstate ts = do } writeTVar devstate ds' return Beep - processuser _ (ControlMessage (Control c@(SessionKey _) _)) = + processuser _ (ControlMessage (Control c@(SessionKey _ _) _)) = return (GotControl c) processuser _ (ControlMessage (Control c@(SessionKeyAccepted _) _)) = return (GotControl c) @@ -421,7 +421,7 @@ processSessionStart sk ochan logger dsv = do <$> atomically (readTMChan ochan) logger sessionmsg sigverifier <- case sessionmsg of - User (ControlMessage c@(Control (SessionKey spk) _)) -> do + User (ControlMessage c@(Control (SessionKey spk _) _)) -> do let pk = case spk of GpgSigned k _ _ -> k UnSigned k -> k |