turnkey/openpgp-card
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make name optional in make_cert()

Browse source
This commit is contained in:
Heiko Schaefer 2022-03-30 01:40:14 +02:00
parent 283f58d7d8
commit 418bfc83f0
No known key found for this signature in database
GPG key ID: 4A849A1904CCBD7D
1 changed files with 29 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
openpgp-card-sequoia/src/util.rs
View file

@ -128,14 +128,13 @@ pub fn make_cert<'app>(
} }
} }
// 6) add user id from name / email // 6) add user id from cardholder name (if a name is set)
let cardholder = open.cardholder_related_data()?; let cardholder = open.cardholder_related_data()?;
// FIXME: process name field? // FIXME: accept user id/email as argument?!
// FIXME: accept email as argument?! if let Some(name) = cardholder.name() {
let uid: UserID = name.into();
let uid: UserID = cardholder.name().expect("expecting name on card").into();
pp.push(uid.clone().into()); pp.push(uid.clone().into());
@ -163,11 +162,13 @@ pub fn make_cert<'app>(
// Temporary version of the cert // Temporary version of the cert
let cert = Cert::try_from(pp.clone())?; let cert = Cert::try_from(pp.clone())?;
let signing_bsig: Packet = uid.bind(&mut card_signer, &cert, signing_builder)?.into(); let signing_bsig: Packet =
uid.bind(&mut card_signer, &cert, signing_builder)?.into();
pp.push(signing_bsig); pp.push(signing_bsig);
} }
} }
}
Cert::try_from(pp) Cert::try_from(pp)
} }