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

Do not return Result from validate_detached_signature

Browse Source 
It never returns errors.
This commit is contained in:
link2xt
2022-12-23 01:18:03 +00:00
parent ba82ce2798
commit 736950ab3f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/decrypt.rs
View File

@@ -38,7 +38,7 @@ pub async fn try_decrypt(
{ {
None => { None => {
return Ok( return Ok(
validate_detached_signature(mail, &public_keyring_for_validate)? validate_detached_signature(mail, &public_keyring_for_validate)
.map(|(raw, fprints)| (raw, fprints, false)), .map(|(raw, fprints)| (raw, fprints, false)),
) )
} }
@@ -221,7 +221,7 @@ async fn decrypt_part(
// If decrypted part is a multipart/signed, then there is a detached signature. // If decrypted part is a multipart/signed, then there is a detached signature.
let decrypted_part = mailparse::parse_mail(&plain)?; let decrypted_part = mailparse::parse_mail(&plain)?;
if let Some((content, valid_detached_signatures)) = if let Some((content, valid_detached_signatures)) =
validate_detached_signature(&decrypted_part, &public_keyring_for_validate)? validate_detached_signature(&decrypted_part, &public_keyring_for_validate)
{ {
return Ok(Some((content, valid_detached_signatures))); return Ok(Some((content, valid_detached_signatures)));
} else { } else {
@@ -256,9 +256,9 @@ fn has_decrypted_pgp_armor(input: &[u8]) -> bool {
fn validate_detached_signature( fn validate_detached_signature(
mail: &ParsedMail<'_>, mail: &ParsedMail<'_>,
public_keyring_for_validate: &Keyring<SignedPublicKey>, public_keyring_for_validate: &Keyring<SignedPublicKey>,
) -> Result<Option<(Vec<u8>, HashSet<Fingerprint>)>> { ) -> Option<(Vec<u8>, HashSet<Fingerprint>)> {
if mail.ctype.mimetype != "multipart/signed" { if mail.ctype.mimetype != "multipart/signed" {
return Ok(None); return None;
} }
if let [first_part, second_part] = &mail.subparts[..] { if let [first_part, second_part] = &mail.subparts[..] {
@@ -269,9 +269,9 @@ fn validate_detached_signature(
.unwrap_or_default(), .unwrap_or_default(),
Err(_) => Default::default(), Err(_) => Default::default(),
}; };
Ok(Some((content.to_vec(), ret_valid_signatures))) Some((content.to_vec(), ret_valid_signatures))
} else { } else {
Ok(None) None
} }
} }