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

refactor: do not chain Autocrypt key verification to parsing

Browse Source 
.and_then() and Ok() are unnecessary here.
This commit is contained in:
link2xt
2026-02-25 22:52:37 +00:00
committed by l
parent cb783ffc12
commit 072c0061ee
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/aheader.rs
View File

@@ -108,13 +108,11 @@ impl FromStr for Aheader {
.remove("keydata") .remove("keydata")
.context("keydata attribute is not found") .context("keydata attribute is not found")
.and_then(|raw| { .and_then(|raw| {
SignedPublicKey::from_base64(&raw).context("autocrypt key cannot be decoded") SignedPublicKey::from_base64(&raw).context("Autocrypt key cannot be decoded")
})
.and_then(|key| {
key.verify_bindings()
.and(Ok(key))
.context("Autocrypt key cannot be verified")
})?; })?;
public_key
.verify_bindings()
.context("Autocrypt key cannot be verified")?;
let prefer_encrypt = attributes let prefer_encrypt = attributes
.remove("prefer-encrypt") .remove("prefer-encrypt")