Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-29 11:26:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

pgp: refactor and document pk_decrypt()

Browse Source 
Avoid unnecessary indexing, decompress only once and check if the message
is Signed before trying to verify it.
This commit is contained in:
Alexander Krotov
2020-06-14 19:31:19 +03:00
committed by link2xt
parent 40c9c2752b
commit baba91c054
1 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/pgp.rs
View File

@@ -272,6 +272,14 @@ pub async fn pk_encrypt(
.await .await
} }
/// Decrypts the message with keys from the private key keyring.
///
/// Receiver private keys are provided in
/// `private_keys_for_decryption`.
///
/// If `ret_signature_fingerprints` is not `None`, stores fingerprints
/// of all keys from the `public_keys_for_validation` keyring that
/// have valid signatures there.
#[allow(clippy::implicit_hasher)] #[allow(clippy::implicit_hasher)]
pub async fn pk_decrypt( pub async fn pk_decrypt(
ctext: Vec<u8>, ctext: Vec<u8>,
@@ -290,36 +298,41 @@ pub async fn pk_decrypt(
}) })
.await?; .await?;
ensure!(!msgs.is_empty(), "No valid messages found"); if let Some(msg) = msgs.into_iter().next() {
// get_content() will decompress the message if needed,
// but this avoids decompressing it again to check signatures
let msg = msg.decompress()?;
let content = match msgs[0].get_content()? { let content = match msg.get_content()? {
Some(content) => content, Some(content) => content,
None => bail!("Decrypted message is empty"), None => bail!("The decrypted message is empty"),
}; };
if let Some(ret_signature_fingerprints) = ret_signature_fingerprints { if let Some(ret_signature_fingerprints) = ret_signature_fingerprints {
if !public_keys_for_validation.is_empty() { if !public_keys_for_validation.is_empty() {
let fingerprints = async_std::task::spawn_blocking(move || { let fingerprints = async_std::task::spawn_blocking(move || {
let dec_msg = &msgs[0]; let pkeys = public_keys_for_validation.keys();
let pkeys = public_keys_for_validation.keys(); let mut fingerprints: Vec<Fingerprint> = Vec::new();
if let signed_msg @ pgp::composed::Message::Signed { .. } = msg {
let mut fingerprints: Vec<Fingerprint> = Vec::new(); for pkey in pkeys {
for pkey in pkeys { if signed_msg.verify(&pkey.primary_key).is_ok() {
if dec_msg.verify(&pkey.primary_key).is_ok() { let fp = DcKey::fingerprint(pkey);
let fp = DcKey::fingerprint(pkey); fingerprints.push(fp);
fingerprints.push(fp); }
}
} }
} fingerprints
fingerprints })
}) .await;
.await;
ret_signature_fingerprints.extend(fingerprints); ret_signature_fingerprints.extend(fingerprints);
}
} }
Ok(content)
} else {
bail!("No valid messages found");
} }
Ok(content)
} }
/// Symmetric encryption. /// Symmetric encryption.