Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-16 21:36:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Accept keyring by reference in pk_decrypt

Browse Source
This commit is contained in:
link2xt
2021-12-05 07:30:47 +00:00
parent bb3353397d
commit 7ff3cf4af0
2 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/e2ee.rs
View File

@@ -305,7 +305,7 @@ async fn decrypt_part(
if has_decrypted_pgp_armor(&data) { if has_decrypted_pgp_armor(&data) {
let (plain, ret_valid_signatures) = let (plain, ret_valid_signatures) =
pgp::pk_decrypt(data, private_keyring, public_keyring_for_validate).await?; pgp::pk_decrypt(data, private_keyring, &public_keyring_for_validate).await?;
// If the message was wrongly or not signed, still return the plain text. // If the message was wrongly or not signed, still return the plain text.
// The caller has to check the signatures then. // The caller has to check the signatures then.

32
src/pgp.rs
View File

@@ -284,7 +284,7 @@ pub async fn pk_encrypt(
pub async fn pk_decrypt( pub async fn pk_decrypt(
ctext: Vec<u8>, ctext: Vec<u8>,
private_keys_for_decryption: Keyring<SignedSecretKey>, private_keys_for_decryption: Keyring<SignedSecretKey>,
public_keys_for_validation: Keyring<SignedPublicKey>, public_keys_for_validation: &Keyring<SignedPublicKey>,
) -> Result<(Vec<u8>, HashSet<Fingerprint>)> { ) -> Result<(Vec<u8>, HashSet<Fingerprint>)> {
let mut ret_signature_fingerprints: HashSet<Fingerprint> = Default::default(); let mut ret_signature_fingerprints: HashSet<Fingerprint> = Default::default();
@@ -310,21 +310,17 @@ pub async fn pk_decrypt(
}; };
if !public_keys_for_validation.is_empty() { if !public_keys_for_validation.is_empty() {
let fingerprints = async_std::task::spawn_blocking(move || { let pkeys = public_keys_for_validation.keys();
let pkeys = public_keys_for_validation.keys();
let mut fingerprints: Vec<Fingerprint> = Vec::new(); let mut fingerprints: Vec<Fingerprint> = Vec::new();
if let signed_msg @ pgp::composed::Message::Signed { .. } = msg { if let signed_msg @ pgp::composed::Message::Signed { .. } = msg {
for pkey in pkeys { for pkey in pkeys {
if signed_msg.verify(&pkey.primary_key).is_ok() { if signed_msg.verify(&pkey.primary_key).is_ok() {
let fp = DcKey::fingerprint(pkey); let fp = DcKey::fingerprint(pkey);
fingerprints.push(fp); fingerprints.push(fp);
}
} }
} }
fingerprints }
})
.await;
ret_signature_fingerprints.extend(fingerprints); ret_signature_fingerprints.extend(fingerprints);
} }
@@ -494,7 +490,7 @@ mod tests {
let (plain, valid_signatures) = pk_decrypt( let (plain, valid_signatures) = pk_decrypt(
CTEXT_SIGNED.as_bytes().to_vec(), CTEXT_SIGNED.as_bytes().to_vec(),
decrypt_keyring, decrypt_keyring,
sig_check_keyring &sig_check_keyring,
) )
.await .await
.map_err(|err| println!("{:?}", err)) .map_err(|err| println!("{:?}", err))
@@ -510,7 +506,7 @@ mod tests {
let (plain, valid_signatures) = pk_decrypt( let (plain, valid_signatures) = pk_decrypt(
CTEXT_SIGNED.as_bytes().to_vec(), CTEXT_SIGNED.as_bytes().to_vec(),
decrypt_keyring, decrypt_keyring,
sig_check_keyring &sig_check_keyring,
) )
.await .await
.map_err(|err| println!("{:?}", err)) .map_err(|err| println!("{:?}", err))
@@ -525,7 +521,7 @@ mod tests {
keyring.add(KEYS.alice_secret.clone()); keyring.add(KEYS.alice_secret.clone());
let empty_keyring = Keyring::new(); let empty_keyring = Keyring::new();
let (plain, valid_signatures) = let (plain, valid_signatures) =
pk_decrypt(CTEXT_SIGNED.as_bytes().to_vec(), keyring, empty_keyring) pk_decrypt(CTEXT_SIGNED.as_bytes().to_vec(), keyring, &empty_keyring)
.await .await
.unwrap(); .unwrap();
assert_eq!(plain, CLEARTEXT); assert_eq!(plain, CLEARTEXT);
@@ -542,7 +538,7 @@ mod tests {
let (plain, valid_signatures) = pk_decrypt( let (plain, valid_signatures) = pk_decrypt(
CTEXT_SIGNED.as_bytes().to_vec(), CTEXT_SIGNED.as_bytes().to_vec(),
decrypt_keyring, decrypt_keyring,
sig_check_keyring, &sig_check_keyring,
) )
.await .await
.unwrap(); .unwrap();
@@ -558,7 +554,7 @@ mod tests {
let (plain, valid_signatures) = pk_decrypt( let (plain, valid_signatures) = pk_decrypt(
CTEXT_UNSIGNED.as_bytes().to_vec(), CTEXT_UNSIGNED.as_bytes().to_vec(),
decrypt_keyring, decrypt_keyring,
sig_check_keyring, &sig_check_keyring,
) )
.await .await
.unwrap(); .unwrap();