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

Merge pull request #304 from link2xt/set_self_key_bool

Browse Source 
Return bool from set_self_key()
This commit is contained in:
Friedel Ziegelmayer
2019-08-08 12:20:15 +02:00
committed by GitHub
parent 7863f5719c 8c933f8fa8
commit aab2336223
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/dc_imex.rs
View File

@@ -326,7 +326,7 @@ pub unsafe fn dc_continue_key_transfer(
armored_key = dc_decrypt_setup_file(context, norm_sc, filecontent); armored_key = dc_decrypt_setup_file(context, norm_sc, filecontent);
if armored_key.is_null() { if armored_key.is_null() {
warn!(context, 0, "Cannot decrypt Autocrypt Setup Message.",); warn!(context, 0, "Cannot decrypt Autocrypt Setup Message.",);
} else if !(0 == set_self_key(context, armored_key, 1i32)) { } else if set_self_key(context, armored_key, 1) {
/*set default*/ /*set default*/
/* error already logged */ /* error already logged */
success = 1i32 success = 1i32
@@ -343,12 +343,11 @@ pub unsafe fn dc_continue_key_transfer(
success success
} }
// TODO should return bool /rtn
fn set_self_key( fn set_self_key(
context: &Context, context: &Context,
armored_c: *const libc::c_char, armored_c: *const libc::c_char,
set_default: libc::c_int, set_default: libc::c_int,
) -> libc::c_int { ) -> bool {
assert!(!armored_c.is_null(), "invalid buffer"); assert!(!armored_c.is_null(), "invalid buffer");
let armored = as_str(armored_c); let armored = as_str(armored_c);
@@ -358,7 +357,7 @@ fn set_self_key(
if keys.is_none() { if keys.is_none() {
error!(context, 0, "File does not contain a valid private key.",); error!(context, 0, "File does not contain a valid private key.",);
return 0; return false;
} }
let (private_key, public_key, header) = keys.unwrap(); let (private_key, public_key, header) = keys.unwrap();
@@ -372,7 +371,7 @@ fn set_self_key(
) )
.is_err() .is_err()
{ {
return 0; return false;
} }
if 0 != set_default { if 0 != set_default {
@@ -384,7 +383,7 @@ fn set_self_key(
) )
.is_err() .is_err()
{ {
return 0; return false;
} }
} else { } else {
error!(context, 0, "File does not contain a private key.",); error!(context, 0, "File does not contain a private key.",);
@@ -394,7 +393,7 @@ fn set_self_key(
if self_addr.is_none() { if self_addr.is_none() {
error!(context, 0, "Missing self addr"); error!(context, 0, "Missing self addr");
return 0; return false;
} }
if !dc_key_save_self_keypair( if !dc_key_save_self_keypair(
@@ -406,20 +405,20 @@ fn set_self_key(
&context.sql, &context.sql,
) { ) {
error!(context, 0, "Cannot save keypair."); error!(context, 0, "Cannot save keypair.");
return 0; return false;
} }
match preferencrypt.map(|s| s.as_str()) { match preferencrypt.map(|s| s.as_str()) {
Some("") => 0, Some("") => false,
Some("nopreference") => context Some("nopreference") => context
.sql .sql
.set_config_int(context, "e2ee_enabled", 0) .set_config_int(context, "e2ee_enabled", 0)
.is_ok() as libc::c_int, .is_ok(),
Some("mutual") => context Some("mutual") => context
.sql .sql
.set_config_int(context, "e2ee_enabled", 1) .set_config_int(context, "e2ee_enabled", 1)
.is_ok() as libc::c_int, .is_ok(),
_ => 1, _ => true,
} }
} }
@@ -1155,7 +1154,7 @@ unsafe fn import_self_keys(context: &Context, dir_name: *const libc::c_char) ->
); );
set_default = 0i32 set_default = 0i32
} }
if 0 == set_self_key(context, private_key, set_default) { if !set_self_key(context, private_key, set_default) {
continue; continue;
} }
imported_cnt += 1 imported_cnt += 1