kotovalexarian-likes-gitlab
/
hagrid-keyserver--hagrid
mirror of https://gitlab.com/hagrid-keyserver/hagrid.git
1
0
Fork 0
Code Releases Activity

database: simplify tpk_to_string 

Use the convenience function to armor certificates.  This also adds
comments to the armor blocks, making it easier to identify
certificates when casually inspecting them as text files.
This commit is contained in:
Justus Winter 2021-01-13 13:05:54 +01:00 committed by Vincent Breitmoser
parent e1e88037e8
commit a9b1363d09
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
database/src/openpgp_utils.rs
View File

@ -4,8 +4,7 @@ use std::convert::TryFrom;
use openpgp::{
Cert,
types::RevocationStatus,
armor::{Writer, Kind},
serialize::Serialize as OpenPgpSerialize,
serialize::SerializeInto as _,
policy::StandardPolicy,
};
@ -22,13 +21,7 @@ pub fn is_status_revoked(status: RevocationStatus) -> bool {
}
pub fn tpk_to_string(tpk: &Cert) -> Result<Vec<u8>> {
let mut buf = Vec::new();
{
let mut armor_writer = Writer::new(&mut buf, Kind::PublicKey)?;
tpk.serialize(&mut armor_writer)?;
armor_writer.finalize()?;
}
Ok(buf)
tpk.armored().to_vec()
}
pub fn tpk_clean(tpk: &Cert) -> Result<Cert> {