diff --git a/src/e2ee.rs b/src/e2ee.rs index b256939d6..3bdd9c1f1 100644 --- a/src/e2ee.rs +++ b/src/e2ee.rs @@ -28,7 +28,7 @@ use crate::key::*; use crate::keyring::*; use crate::mimefactory::MimeFactory; use crate::peerstate::*; -use crate::pgp::*; +use crate::pgp; use crate::securejoin::handle_degrade_event; use crate::wrapmime; use crate::wrapmime::*; @@ -211,7 +211,7 @@ impl EncryptHelper { "could not write/allocate" ); - let ctext = dc_pgp_pk_encrypt( + let ctext = pgp::pk_encrypt( std::slice::from_raw_parts((*plain).str_0 as *const u8, (*plain).len), &keyring, sign_key.as_ref(), @@ -398,7 +398,7 @@ fn load_or_generate_self_public_key(context: &Context, self_addr: impl AsRef { match dc_key_save_self_keypair( context, @@ -581,7 +581,7 @@ fn decrypt_part( // we should only have one decryption happening ensure!(ret_valid_signatures.is_empty(), "corrupt signatures"); - let plain = match dc_pgp_pk_decrypt( + let plain = match pgp::pk_decrypt( &data, &private_keyring, &public_keyring_for_validate, diff --git a/src/imex.rs b/src/imex.rs index 82d7232b1..fb1b12f83 100644 --- a/src/imex.rs +++ b/src/imex.rs @@ -17,7 +17,7 @@ use crate::job::*; use crate::key::*; use crate::message::Message; use crate::param::*; -use crate::pgp::*; +use crate::pgp; use crate::sql::{self, Sql}; use crate::stock::StockMessage; @@ -169,7 +169,7 @@ pub fn render_setup_file(context: &Context, passphrase: &str) -> Result true => Some(("Autocrypt-Prefer-Encrypt", "mutual")), }; let private_key_asc = private_key.to_asc(ac_headers); - let encr = dc_pgp_symm_encrypt(&passphrase, private_key_asc.as_bytes())?; + let encr = pgp::symm_encrypt(&passphrase, private_key_asc.as_bytes())?; let replacement = format!( concat!( @@ -323,7 +323,7 @@ fn decrypt_setup_file( passphrase: &str, file: T, ) -> Result { - let plain_bytes = dc_pgp_symm_decrypt(passphrase, file)?; + let plain_bytes = pgp::symm_decrypt(passphrase, file)?; let plain_text = std::string::String::from_utf8(plain_bytes)?; Ok(plain_text) @@ -713,8 +713,9 @@ fn export_key_to_asc_file( mod tests { use super::*; + use crate::pgp::{split_armored_data, HEADER_AUTOCRYPT, HEADER_SETUPCODE}; use crate::test_utils::*; - use pgp::armor::BlockType; + use ::pgp::armor::BlockType; #[test] fn test_render_setup_file() { diff --git a/src/key.rs b/src/key.rs index 48d641d8c..a643aa391 100644 --- a/src/key.rs +++ b/src/key.rs @@ -381,7 +381,7 @@ i8pcjGO+IZffvyZJVRWfVooBJmWWbPB1pueo3tx8w3+fcuzpxz+RLFKaPyqXO+dD #[test] #[ignore] // is too expensive fn test_from_slice_roundtrip() { - let (public_key, private_key) = crate::pgp::dc_pgp_create_keypair("hello").unwrap(); + let (public_key, private_key) = crate::pgp::create_keypair("hello").unwrap(); let binary = public_key.to_bytes(); let public_key2 = Key::from_slice(&binary, KeyType::Public).expect("invalid public key"); @@ -416,7 +416,7 @@ i8pcjGO+IZffvyZJVRWfVooBJmWWbPB1pueo3tx8w3+fcuzpxz+RLFKaPyqXO+dD #[test] #[ignore] // is too expensive fn test_ascii_roundtrip() { - let (public_key, private_key) = crate::pgp::dc_pgp_create_keypair("hello").unwrap(); + let (public_key, private_key) = crate::pgp::create_keypair("hello").unwrap(); let s = public_key.to_armored_string(None).unwrap(); let (public_key2, _) = diff --git a/src/pgp.rs b/src/pgp.rs index 5565659bb..b2f4f1f05 100644 --- a/src/pgp.rs +++ b/src/pgp.rs @@ -47,7 +47,7 @@ pub fn split_armored_data( } /// Create a new key pair. -pub fn dc_pgp_create_keypair(addr: impl AsRef) -> Option<(Key, Key)> { +pub fn create_keypair(addr: impl AsRef) -> Option<(Key, Key)> { let user_id = format!("<{}>", addr.as_ref()); let key_params = SecretKeyParamsBuilder::default() @@ -97,7 +97,7 @@ pub fn dc_pgp_create_keypair(addr: impl AsRef) -> Option<(Key, Key)> { Some((Key::Public(public_key), Key::Secret(private_key))) } -pub fn dc_pgp_pk_encrypt( +pub fn pk_encrypt( plain: &[u8], public_keys_for_encryption: &Keyring, private_key_for_signing: Option<&Key>, @@ -134,7 +134,7 @@ pub fn dc_pgp_pk_encrypt( Ok(encoded_msg) } -pub fn dc_pgp_pk_decrypt( +pub fn pk_decrypt( ctext: &[u8], private_keys_for_decryption: &Keyring, public_keys_for_validation: &Keyring, @@ -183,7 +183,7 @@ pub fn dc_pgp_pk_decrypt( } /// Symmetric encryption. -pub fn dc_pgp_symm_encrypt(passphrase: &str, plain: &[u8]) -> Result { +pub fn symm_encrypt(passphrase: &str, plain: &[u8]) -> Result { let mut rng = thread_rng(); let lit_msg = Message::new_literal_bytes("", plain); @@ -197,7 +197,7 @@ pub fn dc_pgp_symm_encrypt(passphrase: &str, plain: &[u8]) -> Result( +pub fn symm_decrypt( passphrase: &str, ctext: T, ) -> Result, Error> { diff --git a/tests/stress.rs b/tests/stress.rs index 4adfd6c1c..364079da5 100644 --- a/tests/stress.rs +++ b/tests/stress.rs @@ -8,7 +8,7 @@ use deltachat::contact::*; use deltachat::context::*; use deltachat::keyring::*; use deltachat::oauth2::*; -use deltachat::pgp::*; +use deltachat::pgp; use deltachat::Event; use tempfile::{tempdir, TempDir}; @@ -100,11 +100,11 @@ unsafe fn stress_functions(context: &Context) { #[test] #[ignore] // is too expensive fn test_encryption_decryption() { - let (public_key, private_key) = dc_pgp_create_keypair("foo@bar.de").unwrap(); + let (public_key, private_key) = pgp::create_keypair("foo@bar.de").unwrap(); private_key.split_key().unwrap(); - let (public_key2, private_key2) = dc_pgp_create_keypair("two@zwo.de").unwrap(); + let (public_key2, private_key2) = pgp::create_keypair("two@zwo.de").unwrap(); assert_ne!(public_key, public_key2); @@ -113,11 +113,11 @@ fn test_encryption_decryption() { keyring.add_owned(public_key.clone()); keyring.add_ref(&public_key2); - let ctext_signed = dc_pgp_pk_encrypt(original_text, &keyring, Some(&private_key)).unwrap(); + let ctext_signed = pgp::pk_encrypt(original_text, &keyring, Some(&private_key)).unwrap(); assert!(!ctext_signed.is_empty()); assert!(ctext_signed.starts_with("-----BEGIN PGP MESSAGE-----")); - let ctext_unsigned = dc_pgp_pk_encrypt(original_text, &keyring, None).unwrap(); + let ctext_unsigned = pgp::pk_encrypt(original_text, &keyring, None).unwrap(); assert!(!ctext_unsigned.is_empty()); assert!(ctext_unsigned.starts_with("-----BEGIN PGP MESSAGE-----")); @@ -132,7 +132,7 @@ fn test_encryption_decryption() { let mut valid_signatures: HashSet = Default::default(); - let plain = dc_pgp_pk_decrypt( + let plain = pgp::pk_decrypt( ctext_signed.as_bytes(), &keyring, &public_keyring, @@ -146,7 +146,7 @@ fn test_encryption_decryption() { valid_signatures.clear(); let empty_keyring = Keyring::default(); - let plain = dc_pgp_pk_decrypt( + let plain = pgp::pk_decrypt( ctext_signed.as_bytes(), &keyring, &empty_keyring, @@ -158,7 +158,7 @@ fn test_encryption_decryption() { valid_signatures.clear(); - let plain = dc_pgp_pk_decrypt( + let plain = pgp::pk_decrypt( ctext_signed.as_bytes(), &keyring, &public_keyring2, @@ -172,7 +172,7 @@ fn test_encryption_decryption() { public_keyring2.add_ref(&public_key); - let plain = dc_pgp_pk_decrypt( + let plain = pgp::pk_decrypt( ctext_signed.as_bytes(), &keyring, &public_keyring2, @@ -184,7 +184,7 @@ fn test_encryption_decryption() { valid_signatures.clear(); - let plain = dc_pgp_pk_decrypt( + let plain = pgp::pk_decrypt( ctext_unsigned.as_bytes(), &keyring, &public_keyring, @@ -201,8 +201,7 @@ fn test_encryption_decryption() { let mut public_keyring = Keyring::default(); public_keyring.add_ref(&public_key); - let plain = - dc_pgp_pk_decrypt(ctext_signed.as_bytes(), &keyring, &public_keyring, None).unwrap(); + let plain = pgp::pk_decrypt(ctext_signed.as_bytes(), &keyring, &public_keyring, None).unwrap(); assert_eq!(plain, original_text); }