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

cargo-fmt

Browse Source
This commit is contained in:
Dmitry Bogatov
2019-09-11 02:19:48 +00:00
parent 71a01d3002
commit 2eda839303
1 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/dc_imex.rs
View File

@@ -277,42 +277,42 @@ pub unsafe fn dc_continue_key_transfer(
if msg_id <= 9i32 as libc::c_uint || setup_code.is_null() { if msg_id <= 9i32 as libc::c_uint || setup_code.is_null() {
return false; return false;
} }
let msg = dc_get_msg(context, msg_id); let msg = dc_get_msg(context, msg_id);
if msg.is_err() if msg.is_err()
|| !dc_msg_is_setupmessage(msg.as_ref().unwrap()) || !dc_msg_is_setupmessage(msg.as_ref().unwrap())
|| { || {
filename = dc_msg_get_file(msg.as_ref().unwrap()); filename = dc_msg_get_file(msg.as_ref().unwrap());
filename.is_null() filename.is_null()
} }
|| *filename.offset(0isize) as libc::c_int == 0i32 || *filename.offset(0isize) as libc::c_int == 0i32
{ {
error!(context, "Message is no Autocrypt Setup Message.",); error!(context, "Message is no Autocrypt Setup Message.",);
} else if 0 } else if 0
== dc_read_file( == dc_read_file(
context, context,
filename, filename,
&mut filecontent as *mut *mut libc::c_char as *mut *mut libc::c_void, &mut filecontent as *mut *mut libc::c_char as *mut *mut libc::c_void,
&mut filebytes, &mut filebytes,
) )
|| filecontent.is_null() || filecontent.is_null()
|| filebytes <= 0 || filebytes <= 0
{ {
error!(context, "Cannot read Autocrypt Setup Message file.",); error!(context, "Cannot read Autocrypt Setup Message file.",);
} else {
norm_sc = dc_normalize_setup_code(context, setup_code);
if norm_sc.is_null() {
warn!(context, "Cannot normalize Setup Code.",);
} else { } else {
norm_sc = dc_normalize_setup_code(context, setup_code); armored_key = dc_decrypt_setup_file(context, norm_sc, filecontent);
if norm_sc.is_null() { if armored_key.is_null() {
warn!(context, "Cannot normalize Setup Code.",); warn!(context, "Cannot decrypt Autocrypt Setup Message.",);
} else { } else if set_self_key(context, armored_key, 1) {
armored_key = dc_decrypt_setup_file(context, norm_sc, filecontent); /*set default*/
if armored_key.is_null() { /* error already logged */
warn!(context, "Cannot decrypt Autocrypt Setup Message.",); success = true
} else if set_self_key(context, armored_key, 1) {
/*set default*/
/* error already logged */
success = true
}
} }
} }
}
free(armored_key as *mut libc::c_void); free(armored_key as *mut libc::c_void);
free(filecontent as *mut libc::c_void); free(filecontent as *mut libc::c_void);