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

target comment of @flub

Browse Source
This commit is contained in:
B. Petersen
2020-01-24 21:22:12 +01:00
parent c54e211147
commit d74b06f8bf
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/securejoin.rs
View File

@@ -623,7 +623,7 @@ pub(crate) fn handle_securejoin_handshake(
==== Bob - the joiner's side ==== ==== Bob - the joiner's side ====
==== Step 7 in "Setup verified contact" protocol ==== ==== Step 7 in "Setup verified contact" protocol ====
=======================================================*/ =======================================================*/
let ret = if join_vg { let abort_retval = if join_vg {
HandshakeMessage::Propagate HandshakeMessage::Propagate
} else { } else {
HandshakeMessage::Ignore HandshakeMessage::Ignore
@@ -631,7 +631,7 @@ pub(crate) fn handle_securejoin_handshake(
if context.bob.read().unwrap().expects != DC_VC_CONTACT_CONFIRM { if context.bob.read().unwrap().expects != DC_VC_CONTACT_CONFIRM {
info!(context, "Message belongs to a different handshake.",); info!(context, "Message belongs to a different handshake.",);
return Ok(ret); return Ok(abort_retval);
} }
let cond = { let cond = {
let bob = context.bob.read().unwrap(); let bob = context.bob.read().unwrap();
@@ -643,7 +643,7 @@ pub(crate) fn handle_securejoin_handshake(
context, context,
"Message out of sync or belongs to a different handshake.", "Message out of sync or belongs to a different handshake.",
); );
return Ok(ret); return Ok(abort_retval);
} }
let scanned_fingerprint_of_alice = get_qr_attr!(context, fingerprint).to_string(); let scanned_fingerprint_of_alice = get_qr_attr!(context, fingerprint).to_string();
@@ -674,7 +674,7 @@ pub(crate) fn handle_securejoin_handshake(
"Contact confirm message not encrypted.", "Contact confirm message not encrypted.",
); );
context.bob.write().unwrap().status = 0; context.bob.write().unwrap().status = 0;
return Ok(ret); return Ok(abort_retval);
} }
if mark_peer_as_verified(context, &scanned_fingerprint_of_alice).is_err() { if mark_peer_as_verified(context, &scanned_fingerprint_of_alice).is_err() {
@@ -683,7 +683,7 @@ pub(crate) fn handle_securejoin_handshake(
contact_chat_id, contact_chat_id,
"Fingerprint mismatch on joiner-side.", "Fingerprint mismatch on joiner-side.",
); );
return Ok(ret); return Ok(abort_retval);
} }
Contact::scaleup_origin_by_id(context, contact_id, Origin::SecurejoinJoined); Contact::scaleup_origin_by_id(context, contact_id, Origin::SecurejoinJoined);
emit_event!(context, Event::ContactsChanged(None)); emit_event!(context, Event::ContactsChanged(None));
@@ -697,7 +697,7 @@ pub(crate) fn handle_securejoin_handshake(
.map_err(|_| HandshakeError::NoSelfAddr)? .map_err(|_| HandshakeError::NoSelfAddr)?
{ {
info!(context, "Message belongs to a different handshake (scaled up contact anyway to allow creation of group)."); info!(context, "Message belongs to a different handshake (scaled up contact anyway to allow creation of group).");
return Ok(ret); return Ok(abort_retval);
} }
secure_connection_established(context, contact_chat_id); secure_connection_established(context, contact_chat_id);
context.bob.write().unwrap().expects = 0; context.bob.write().unwrap().expects = 0;