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

crypto: Properly clamp the rotation period of the outbound session

master
Damir Jelić 2021-01-18 20:46:34 +01:00
parent d07063af2b
commit 4af9b74776
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
matrix_sdk_crypto/src/olm/group_sessions/outbound.rs
View File

@ -22,7 +22,7 @@ use matrix_sdk_common::{
uuid::Uuid,
};
use std::{
cmp::min,
cmp::max,
fmt,
sync::{
atomic::{AtomicBool, AtomicU64, Ordering},
@ -279,9 +279,9 @@ impl OutboundGroupSession {
count >= self.settings.rotation_period_msgs
|| self.creation_time.elapsed()
// Since the encryption settings are provided by users and not
// checked someone could set a really low rotation perdiod so
// checked someone could set a really low rotation period so
// clamp it at a minute.
>= min(self.settings.rotation_period, Duration::from_secs(3600))
>= max(self.settings.rotation_period, Duration::from_secs(3600))
}
/// Has the session been invalidated.