Skip to content

Commit 3656337

Browse files
committed
refactor: do not return Result from valid_signature_fingerprints()
This function never fails.
1 parent a89b632 commit 3656337

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/mimeparser.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ impl MimeMessage {
476476
}
477477

478478
let mut signatures = if let Some(ref decrypted_msg) = decrypted_msg {
479-
crate::pgp::valid_signature_fingerprints(decrypted_msg, &public_keyring)?
479+
crate::pgp::valid_signature_fingerprints(decrypted_msg, &public_keyring)
480480
} else {
481481
HashSet::new()
482482
};

src/pgp.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ pub fn pk_decrypt(
272272
pub fn valid_signature_fingerprints(
273273
msg: &pgp::composed::Message,
274274
public_keys_for_validation: &[SignedPublicKey],
275-
) -> Result<HashSet<Fingerprint>> {
275+
) -> HashSet<Fingerprint> {
276276
let mut ret_signature_fingerprints: HashSet<Fingerprint> = Default::default();
277277
if msg.is_signed() {
278278
for pkey in public_keys_for_validation {
@@ -282,7 +282,7 @@ pub fn valid_signature_fingerprints(
282282
}
283283
}
284284
}
285-
Ok(ret_signature_fingerprints)
285+
ret_signature_fingerprints
286286
}
287287

288288
/// Validates detached signature.
@@ -359,7 +359,7 @@ mod tests {
359359
let mut msg = pk_decrypt(ctext.to_vec(), private_keys_for_decryption)?;
360360
let content = msg.as_data_vec()?;
361361
let ret_signature_fingerprints =
362-
valid_signature_fingerprints(&msg, public_keys_for_validation)?;
362+
valid_signature_fingerprints(&msg, public_keys_for_validation);
363363

364364
Ok((msg, ret_signature_fingerprints, content))
365365
}

0 commit comments

Comments
 (0)