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

Remove gotos from dc_e2ee_encrypt function

Browse Source
This commit is contained in:
jikstra
2019-08-07 20:57:42 +02:00
parent 0276f97d96
commit 9034f316ba
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/dc_e2ee.rs
View File

@@ -66,7 +66,7 @@ pub unsafe fn dc_e2ee_encrypt(
mut in_out_message: *mut mailmime, mut in_out_message: *mut mailmime,
helper: &mut dc_e2ee_helper_t, helper: &mut dc_e2ee_helper_t,
) { ) {
let mut current_block: u64 = 0; let mut ok_to_continue = true;
let mut col: libc::c_int = 0i32; let mut col: libc::c_int = 0i32;
let mut do_encrypt: libc::c_int = 0i32; let mut do_encrypt: libc::c_int = 0i32;
/*just a pointer into mailmime structure, must not be freed*/ /*just a pointer into mailmime structure, must not be freed*/
@@ -283,7 +283,7 @@ pub unsafe fn dc_e2ee_encrypt(
); );
mailmime_write_mem(plain, &mut col, message_to_encrypt); mailmime_write_mem(plain, &mut col, message_to_encrypt);
if (*plain).str_0.is_null() || (*plain).len <= 0 { if (*plain).str_0.is_null() || (*plain).len <= 0 {
current_block = 14181132614457621749; ok_to_continue = false;
} else { } else {
if let Some(ctext_v) = dc_pgp_pk_encrypt( if let Some(ctext_v) = dc_pgp_pk_encrypt(
(*plain).str_0 as *const libc::c_void, (*plain).str_0 as *const libc::c_void,
@@ -340,15 +340,11 @@ pub unsafe fn dc_e2ee_encrypt(
(*encrypted_part).mm_parent = in_out_message; (*encrypted_part).mm_parent = in_out_message;
mailmime_free(message_to_encrypt); mailmime_free(message_to_encrypt);
(*helper).encryption_successfull = 1i32; (*helper).encryption_successfull = 1i32;
current_block = 13824533195664196414;
} }
} }
} else {
current_block = 13824533195664196414;
} }
match current_block { // ok_to_continue = false = 14181132614457621749
14181132614457621749 => {} if ok_to_continue {
_ => {
let aheader = Aheader::new(addr, public_key, prefer_encrypt); let aheader = Aheader::new(addr, public_key, prefer_encrypt);
mailimf_fields_add( mailimf_fields_add(
imffields_unprotected, imffields_unprotected,
@@ -357,7 +353,6 @@ pub unsafe fn dc_e2ee_encrypt(
aheader.to_string().strdup(), aheader.to_string().strdup(),
), ),
); );
}
} }
} }
} }