char
/
matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

crypto: Cancel timed out events on the state transitions.

master
Damir Jelić 2020-08-10 14:29:38 +02:00
parent 6c4e2fa508
commit 7eeff64059
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
matrix_sdk_crypto/src/verification/sas/sas_state.rs
View File

@ -57,7 +57,7 @@ const STRINGS: &[ShortAuthenticationString] = &[
const MAX_AGE: Duration = Duration::from_secs(60 * 5); const MAX_AGE: Duration = Duration::from_secs(60 * 5);
// The max time a SAS object will wait for a new event to arrive. // The max time a SAS object will wait for a new event to arrive.
const MAX_EVENT_TIMEOUT: Duration = Duration::from_secs(60 * 1); const MAX_EVENT_TIMEOUT: Duration = Duration::from_secs(60);
/// Struct containing the protocols that were agreed to be used for the SAS /// Struct containing the protocols that were agreed to be used for the SAS
/// flow. /// flow.
@ -244,6 +244,8 @@ impl<S: Clone> SasState<S> {
Err(CancelCode::UnknownTransaction) Err(CancelCode::UnknownTransaction)
} else if sender != self.ids.other_device.user_id() { } else if sender != self.ids.other_device.user_id() {
Err(CancelCode::UserMismatch) Err(CancelCode::UserMismatch)
} else if self.timed_out() {
Err(CancelCode::Timeout)
} else { } else {
Ok(()) Ok(())
} }