From 1a1f0c0a7c9d8cf9758631b22dc3cda06f26bee8 Mon Sep 17 00:00:00 2001 From: dignifiedquire Date: Mon, 26 Aug 2019 22:28:42 +0200 Subject: [PATCH] refactor(e2ee): rename dc_e2ee -> e2ee --- src/configure/mod.rs | 4 ++-- src/contact.rs | 4 ++-- src/dc_imex.rs | 6 +++--- src/dc_mimefactory.rs | 2 +- src/dc_mimeparser.rs | 5 +++-- src/dc_securejoin.rs | 6 +++--- src/{dc_e2ee.rs => e2ee.rs} | 6 +++--- src/lib.rs | 2 +- 8 files changed, 18 insertions(+), 17 deletions(-) rename src/{dc_e2ee.rs => e2ee.rs} (99%) diff --git a/src/configure/mod.rs b/src/configure/mod.rs index aa0ceedcf..e56b251bf 100644 --- a/src/configure/mod.rs +++ b/src/configure/mod.rs @@ -2,9 +2,9 @@ use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC}; use crate::constants::Event; use crate::context::Context; -use crate::dc_e2ee::*; use crate::dc_loginparam::*; use crate::dc_tools::*; +use crate::e2ee; use crate::imap::*; use crate::job::*; use crate::oauth2::*; @@ -589,7 +589,7 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: &Job) { .ok(); if !s.shall_stop_ongoing { progress!(context, 920); - dc_ensure_secret_key_exists(context); + e2ee::ensure_secret_key_exists(context); success = true; info!( context, diff --git a/src/contact.rs b/src/contact.rs index e8e20c0cd..8a4819004 100644 --- a/src/contact.rs +++ b/src/contact.rs @@ -7,9 +7,9 @@ use crate::aheader::EncryptPreference; use crate::config::Config; use crate::constants::*; use crate::context::Context; -use crate::dc_e2ee::*; use crate::dc_loginparam::*; use crate::dc_tools::*; +use crate::e2ee; use crate::error::Result; use crate::key::*; use crate::message::MessageState; @@ -603,7 +603,7 @@ impl<'a> Contact<'a> { }); ret += &p; if self_key.is_none() { - dc_ensure_secret_key_exists(context)?; + e2ee::ensure_secret_key_exists(context)?; self_key = Key::from_self_public(context, &loginparam.addr, &context.sql); } let p = context.stock_str(StockMessage::FingerPrints); diff --git a/src/dc_imex.rs b/src/dc_imex.rs index ef7256664..3bacdbd28 100644 --- a/src/dc_imex.rs +++ b/src/dc_imex.rs @@ -11,8 +11,8 @@ use crate::config::Config; use crate::configure::*; use crate::constants::*; use crate::context::Context; -use crate::dc_e2ee::*; use crate::dc_tools::*; +use crate::e2ee; use crate::error::*; use crate::job::*; use crate::key::*; @@ -196,7 +196,7 @@ pub fn dc_render_setup_file(context: &Context, passphrase: &str) -> Result= 2, "Passphrase must be at least 2 chars long." ); - let self_addr = dc_ensure_secret_key_exists(context)?; + let self_addr = e2ee::ensure_secret_key_exists(context)?; let private_key = Key::from_self_private(context, self_addr, &context.sql) .ok_or(format_err!("Failed to get private key."))?; let ac_headers = match context @@ -522,7 +522,7 @@ pub unsafe fn dc_job_do_DC_JOB_IMEX_IMAP(context: &Context, job: &Job) { } else { if what == 1 || what == 11 { /* before we export anything, make sure the private key exists */ - if dc_ensure_secret_key_exists(context).is_err() { + if e2ee::ensure_secret_key_exists(context).is_err() { error!( context, 0, diff --git a/src/dc_mimefactory.rs b/src/dc_mimefactory.rs index 9ab0b188a..cf9e095a0 100644 --- a/src/dc_mimefactory.rs +++ b/src/dc_mimefactory.rs @@ -15,9 +15,9 @@ use crate::chat::{self, Chat}; use crate::constants::*; use crate::contact::*; use crate::context::{dc_get_version_str, Context}; -use crate::dc_e2ee::*; use crate::dc_strencode::*; use crate::dc_tools::*; +use crate::e2ee::*; use crate::error::Error; use crate::location; use crate::message::*; diff --git a/src/dc_mimeparser.rs b/src/dc_mimeparser.rs index d675be7b5..f2d662571 100644 --- a/src/dc_mimeparser.rs +++ b/src/dc_mimeparser.rs @@ -15,10 +15,10 @@ use mmime::other::*; use crate::constants::Viewtype; use crate::contact::*; use crate::context::Context; -use crate::dc_e2ee::*; use crate::dc_simplify::*; use crate::dc_strencode::*; use crate::dc_tools::*; +use crate::e2ee::*; use crate::location; use crate::param::*; use crate::stock::StockMessage; @@ -137,7 +137,8 @@ pub unsafe fn dc_mimeparser_parse<'a>(context: &'a Context, body: &[u8]) -> dc_m mimeparser .e2ee_helper .decrypt(mimeparser.context, mimeparser.mimeroot); - dc_mimeparser_parse_mime_recursive(&mut mimeparser, mimeparser.mimeroot); + let mimeparser_ref = &mut mimeparser; + dc_mimeparser_parse_mime_recursive(mimeparser_ref, mimeparser_ref.mimeroot); let field: *mut mailimf_field = dc_mimeparser_lookup_field(&mimeparser, "Subject"); if !field.is_null() && (*field).fld_type == MAILIMF_FIELD_SUBJECT as libc::c_int { mimeparser.subject = dc_decode_header_words((*(*field).fld_data.fld_subject).sbj_value) diff --git a/src/dc_securejoin.rs b/src/dc_securejoin.rs index bfd25d170..91ded8271 100644 --- a/src/dc_securejoin.rs +++ b/src/dc_securejoin.rs @@ -8,10 +8,10 @@ use crate::configure::*; use crate::constants::*; use crate::contact::*; use crate::context::Context; -use crate::dc_e2ee::*; use crate::dc_mimeparser::*; use crate::dc_token::*; use crate::dc_tools::*; +use crate::e2ee::*; use crate::key::*; use crate::lot::LotState; use crate::message::*; @@ -34,7 +34,7 @@ pub unsafe fn dc_get_securejoin_qr( let mut fingerprint = ptr::null_mut(); let mut qr: Option = None; - dc_ensure_secret_key_exists(context).ok(); + ensure_secret_key_exists(context).ok(); let invitenumber = dc_token_lookup(context, DC_TOKEN_INVITENUMBER, group_chat_id) .unwrap_or_else(|| { let invitenumber_s = dc_create_id(); @@ -142,7 +142,7 @@ pub unsafe fn dc_join_securejoin(context: &Context, qr: *const libc::c_char) -> let mut join_vg: libc::c_int = 0i32; info!(context, 0, "Requesting secure-join ...",); - dc_ensure_secret_key_exists(context).ok(); + ensure_secret_key_exists(context).ok(); ongoing_allocated = dc_alloc_ongoing(context); if !(ongoing_allocated == 0i32) { diff --git a/src/dc_e2ee.rs b/src/e2ee.rs similarity index 99% rename from src/dc_e2ee.rs rename to src/e2ee.rs index 662aba054..a868574c8 100644 --- a/src/dc_e2ee.rs +++ b/src/e2ee.rs @@ -1025,7 +1025,7 @@ unsafe fn contains_report(mime: *mut mailmime) -> bool { /// /// If this succeeds you are also guaranteed that the /// [Config::ConfiguredAddr] is configured, this address is returned. -pub fn dc_ensure_secret_key_exists(context: &Context) -> Result { +pub fn ensure_secret_key_exists(context: &Context) -> Result { let self_addr = context .get_config(Config::ConfiguredAddr) .ok_or(format_err!(concat!( @@ -1049,13 +1049,13 @@ mod tests { fn test_prexisting() { let t = dummy_context(); let test_addr = configure_alice_keypair(&t.ctx); - assert_eq!(dc_ensure_secret_key_exists(&t.ctx).unwrap(), test_addr); + assert_eq!(ensure_secret_key_exists(&t.ctx).unwrap(), test_addr); } #[test] fn test_not_configured() { let t = dummy_context(); - assert!(dc_ensure_secret_key_exists(&t.ctx).is_err()); + assert!(ensure_secret_key_exists(&t.ctx).is_err()); } } diff --git a/src/lib.rs b/src/lib.rs index e67d6c046..9ec66784c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -30,6 +30,7 @@ pub mod configure; pub mod constants; pub mod contact; pub mod context; +mod e2ee; mod imap; pub mod job; mod job_thread; @@ -51,7 +52,6 @@ pub mod x; pub mod dc_array; mod dc_dehtml; -mod dc_e2ee; pub mod dc_imex; mod dc_loginparam; mod dc_mimefactory;