hatter/tiny-encrypt-rs
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: update code

Browse Source
This commit is contained in:
Hatter Jiang
2023-10-15 16:56:03 +08:00
parent a37d5b8d62
commit 66e93106fe
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/util_envelop.rs
View File

@@ -3,11 +3,9 @@ use crate::spec::TinyEncryptEnvelop;
pub fn format_envelop(envelop: &TinyEncryptEnvelop, config: &Option<TinyEncryptConfig>) -> String { pub fn format_envelop(envelop: &TinyEncryptEnvelop, config: &Option<TinyEncryptConfig>) -> String {
let config_envelop = config.as_ref().and_then(|c| c.find_by_kid(&envelop.kid)); let config_envelop = config.as_ref().and_then(|c| c.find_by_kid(&envelop.kid));
let envelop_kid = config_envelop.and_then(|e| e.sid.as_ref()).map(|sid| let envelop_kid = config_envelop.and_then(|e| e.sid.as_ref())
format!(", Sid: {}", sid) .map(|sid| format!(", Sid: {}", sid))
).unwrap_or_else(|| { .unwrap_or_else(|| format!(", Kid: {}", envelop.kid));
format!(", Kid: {}", envelop.kid)
});
let envelop_desc = get_envelop_desc(envelop, &config_envelop); let envelop_desc = get_envelop_desc(envelop, &config_envelop);
let desc = envelop_desc.as_ref() let desc = envelop_desc.as_ref()
.map(|desc| format!(", Desc: {}", desc)) .map(|desc| format!(", Desc: {}", desc))