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

refactor: make encrypted_and_signed() return bool, not libc::int

Browse Source
This commit is contained in:
Dmitry Bogatov
2019-08-14 07:26:08 +00:00
committed by Friedel Ziegelmayer
parent 8009f220fc
commit cb0eb0e68e
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/dc_securejoin.rs
View File

@@ -442,7 +442,7 @@ pub unsafe fn dc_handle_securejoin_handshake(
grpid = dc_strdup((*scan).text2) grpid = dc_strdup((*scan).text2)
} }
} }
if 0 == encrypted_and_signed(mimeparser, scanned_fingerprint_of_alice) { if !encrypted_and_signed(mimeparser, scanned_fingerprint_of_alice) {
could_not_establish_secure_connection( could_not_establish_secure_connection(
context, context,
contact_chat_id, contact_chat_id,
@@ -518,7 +518,7 @@ pub unsafe fn dc_handle_securejoin_handshake(
b"Fingerprint not provided.\x00" as *const u8 as *const libc::c_char, b"Fingerprint not provided.\x00" as *const u8 as *const libc::c_char,
); );
current_block = 4378276786830486580; current_block = 4378276786830486580;
} else if 0 == encrypted_and_signed(mimeparser, fingerprint) { } else if !encrypted_and_signed(mimeparser, fingerprint) {
could_not_establish_secure_connection( could_not_establish_secure_connection(
context, context,
contact_chat_id, contact_chat_id,
@@ -664,7 +664,7 @@ pub unsafe fn dc_handle_securejoin_handshake(
} }
} }
if 0 != vg_expect_encrypted { if 0 != vg_expect_encrypted {
if 0 == encrypted_and_signed(mimeparser, scanned_fingerprint_of_alice) { if !encrypted_and_signed(mimeparser, scanned_fingerprint_of_alice) {
could_not_establish_secure_connection( could_not_establish_secure_connection(
context, context,
contact_chat_id, contact_chat_id,
@@ -883,22 +883,21 @@ unsafe fn mark_peer_as_verified(
* Tools: Misc. * Tools: Misc.
******************************************************************************/ ******************************************************************************/
// TODO should return bool
unsafe fn encrypted_and_signed( unsafe fn encrypted_and_signed(
mimeparser: &dc_mimeparser_t, mimeparser: &dc_mimeparser_t,
expected_fingerprint: *const libc::c_char, expected_fingerprint: *const libc::c_char,
) -> libc::c_int { ) -> bool {
if 0 == mimeparser.e2ee_helper.encrypted { if 0 == mimeparser.e2ee_helper.encrypted {
warn!(mimeparser.context, 0, "Message not encrypted.",); warn!(mimeparser.context, 0, "Message not encrypted.",);
return 0i32; return false;
} }
if mimeparser.e2ee_helper.signatures.len() <= 0 { if mimeparser.e2ee_helper.signatures.len() <= 0 {
warn!(mimeparser.context, 0, "Message not signed.",); warn!(mimeparser.context, 0, "Message not signed.",);
return 0i32; return false;
} }
if expected_fingerprint.is_null() { if expected_fingerprint.is_null() {
warn!(mimeparser.context, 0, "Fingerprint for comparison missing.",); warn!(mimeparser.context, 0, "Fingerprint for comparison missing.",);
return 0i32; return false;
} }
if !mimeparser if !mimeparser
.e2ee_helper .e2ee_helper
@@ -911,10 +910,10 @@ unsafe fn encrypted_and_signed(
"Message does not match expected fingerprint {}.", "Message does not match expected fingerprint {}.",
as_str(expected_fingerprint), as_str(expected_fingerprint),
); );
return 0; return false;
} }
1 true
} }
pub unsafe fn dc_handle_degrade_event(context: &Context, peerstate: &Peerstate) { pub unsafe fn dc_handle_degrade_event(context: &Context, peerstate: &Peerstate) {