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

run cargo fmt

Browse Source
This commit is contained in:
jikstra
2019-08-07 20:40:50 +02:00
parent b715df9e97
commit 76b3c532b1
1 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/dc_e2ee.rs
View File

@@ -906,45 +906,44 @@ unsafe fn decrypt_part(
} }
} }
if ok_to_continue { if ok_to_continue {
/* encrypted, decoded data in decoded_data now ... */ /* encrypted, decoded data in decoded_data now ... */
if !(0 == has_decrypted_pgp_armor(decoded_data, decoded_data_bytes as libc::c_int)) if !(0 == has_decrypted_pgp_armor(decoded_data, decoded_data_bytes as libc::c_int)) {
{ let add_signatures = if ret_valid_signatures.is_empty() {
let add_signatures = if ret_valid_signatures.is_empty() { Some(ret_valid_signatures)
Some(ret_valid_signatures) } else {
} else { None
None };
};
/*if we already have fingerprints, do not add more; this ensures, only the fingerprints from the outer-most part are collected */ /*if we already have fingerprints, do not add more; this ensures, only the fingerprints from the outer-most part are collected */
if let Some(plain) = dc_pgp_pk_decrypt( if let Some(plain) = dc_pgp_pk_decrypt(
decoded_data as *const libc::c_void, decoded_data as *const libc::c_void,
decoded_data_bytes, decoded_data_bytes,
&private_keyring, &private_keyring,
&public_keyring_for_validate, &public_keyring_for_validate,
add_signatures, add_signatures,
) { ) {
let plain_bytes = plain.len(); let plain_bytes = plain.len();
let plain_buf = plain.as_ptr() as *const libc::c_char; let plain_buf = plain.as_ptr() as *const libc::c_char;
let mut index: size_t = 0i32 as size_t; let mut index: size_t = 0i32 as size_t;
let mut decrypted_mime: *mut mailmime = 0 as *mut mailmime; let mut decrypted_mime: *mut mailmime = 0 as *mut mailmime;
if mailmime_parse( if mailmime_parse(
plain_buf as *const _, plain_buf as *const _,
plain_bytes, plain_bytes,
&mut index, &mut index,
&mut decrypted_mime, &mut decrypted_mime,
) != MAIL_NO_ERROR as libc::c_int ) != MAIL_NO_ERROR as libc::c_int
|| decrypted_mime.is_null() || decrypted_mime.is_null()
{ {
if !decrypted_mime.is_null() { if !decrypted_mime.is_null() {
mailmime_free(decrypted_mime); mailmime_free(decrypted_mime);
}
} else {
*ret_decrypted_mime = decrypted_mime;
sth_decrypted = 1i32
} }
} else {
*ret_decrypted_mime = decrypted_mime;
sth_decrypted = 1i32
} }
} }
}
} }
} }
//mailmime_substitute(mime, new_mime); //mailmime_substitute(mime, new_mime);