Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-04 13:56:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix a merge-issue, and a double-if, and a wrong guard

Browse Source
This commit is contained in:
holger krekel
2019-09-28 11:57:36 +02:00
parent b08a2b4d2c
commit a5cde0d137
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/e2ee.rs
View File

@@ -88,7 +88,7 @@ impl EncryptHelper {
// libEtPan's pgp_encrypt_mime() takes the parent as the new root. // libEtPan's pgp_encrypt_mime() takes the parent as the new root.
// We just expect the root as being given to this function. // We just expect the root as being given to this function.
ensure!( ensure!(
!in_out_message.is_null() && unsafe { !(*in_out_message).mm_parent.is_null() }, !in_out_message.is_null() && unsafe { (*in_out_message).mm_parent.is_null() },
"corrupted inputs" "corrupted inputs"
); );
@@ -335,7 +335,7 @@ pub fn try_decrypt(
} }
if let Some(ref peerstate) = peerstate { if let Some(ref peerstate) = peerstate {
if peerstate.degrade_event.is_some() { if peerstate.degrade_event.is_some() {
handle_degrade_event(context, &peerstate); handle_degrade_event(context, &peerstate)?;
} }
if let Some(ref key) = peerstate.gossip_key { if let Some(ref key) = peerstate.gossip_key {
public_keyring_for_validate.add_ref(key); public_keyring_for_validate.add_ref(key);
@@ -357,10 +357,6 @@ pub fn try_decrypt(
gossipped_addr = gossipped_addr =
update_gossip_peerstates(context, message_time, imffields, gossip_headers)?; update_gossip_peerstates(context, message_time, imffields, gossip_headers)?;
} }
if !gossip_headers.is_null() {
gossipped_addr =
update_gossip_peerstates(context, message_time, imffields, gossip_headers)
}
} }
} }
} }