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

refactor: do not return Result from valid_signature_fingerprints()

Browse Source 
This function never fails.
This commit is contained in:
link2xt
2025-08-16 18:34:56 +00:00
committed by l
parent a89b6321f1
commit 3656337d41
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mimeparser.rs
View File

@@ -476,7 +476,7 @@ impl MimeMessage {
} }
let mut signatures = if let Some(ref decrypted_msg) = decrypted_msg { let mut signatures = if let Some(ref decrypted_msg) = decrypted_msg {
crate::pgp::valid_signature_fingerprints(decrypted_msg, &public_keyring)? crate::pgp::valid_signature_fingerprints(decrypted_msg, &public_keyring)
} else { } else {
HashSet::new() HashSet::new()
}; };

6
src/pgp.rs
View File

@@ -272,7 +272,7 @@ pub fn pk_decrypt(
pub fn valid_signature_fingerprints( pub fn valid_signature_fingerprints(
msg: &pgp::composed::Message, msg: &pgp::composed::Message,
public_keys_for_validation: &[SignedPublicKey], public_keys_for_validation: &[SignedPublicKey],
) -> Result<HashSet<Fingerprint>> { ) -> HashSet<Fingerprint> {
let mut ret_signature_fingerprints: HashSet<Fingerprint> = Default::default(); let mut ret_signature_fingerprints: HashSet<Fingerprint> = Default::default();
if msg.is_signed() { if msg.is_signed() {
for pkey in public_keys_for_validation { for pkey in public_keys_for_validation {
@@ -282,7 +282,7 @@ pub fn valid_signature_fingerprints(
} }
} }
} }
Ok(ret_signature_fingerprints) ret_signature_fingerprints
} }
/// Validates detached signature. /// Validates detached signature.
@@ -359,7 +359,7 @@ mod tests {
let mut msg = pk_decrypt(ctext.to_vec(), private_keys_for_decryption)?; let mut msg = pk_decrypt(ctext.to_vec(), private_keys_for_decryption)?;
let content = msg.as_data_vec()?; let content = msg.as_data_vec()?;
let ret_signature_fingerprints = let ret_signature_fingerprints =
valid_signature_fingerprints(&msg, public_keys_for_validation)?; valid_signature_fingerprints(&msg, public_keys_for_validation);
Ok((msg, ret_signature_fingerprints, content)) Ok((msg, ret_signature_fingerprints, content))
} }