Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-12 11:26:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

priorize e2ee_guaranteed over Reset

Browse Source 
should_encrypt() shall return Ok(false)
on peerstate=EncryptPreference::Reset
only for opportunistic groups.

for verified/protected groups (e2ee_guaranteed set),
Ok(true) or Error() should be returned.

this bug was introduced by #1946 (Require quorum to enable encryption).
This commit is contained in:
B. Petersen
2020-10-14 22:25:58 +02:00
committed by holger krekel
parent e5b0194e8c
commit 7e793a518c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/e2ee.rs
View File

@@ -57,7 +57,7 @@ impl EncryptHelper {
/// preferences, even if message copy is not sent to self. /// preferences, even if message copy is not sent to self.
/// ///
/// `e2ee_guaranteed` should be set to true for replies to encrypted messages (as required by /// `e2ee_guaranteed` should be set to true for replies to encrypted messages (as required by
/// Autocrypt Level 1, version 1.1) and for messages sent in verified groups. /// Autocrypt Level 1, version 1.1) and for messages sent in protected groups.
/// ///
/// Returns an error if `e2ee_guaranteed` is true, but one or more keys are missing. /// Returns an error if `e2ee_guaranteed` is true, but one or more keys are missing.
/// ///
@@ -84,7 +84,11 @@ impl EncryptHelper {
match peerstate.prefer_encrypt { match peerstate.prefer_encrypt {
EncryptPreference::NoPreference => {} EncryptPreference::NoPreference => {}
EncryptPreference::Mutual => prefer_encrypt_count += 1, EncryptPreference::Mutual => prefer_encrypt_count += 1,
EncryptPreference::Reset => return Ok(false), EncryptPreference::Reset => {
if !e2ee_guaranteed {
return Ok(false);
}
}
}; };
} }
None => { None => {