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

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

@ -128,44 +128,45 @@ 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()); // 7) make, sign binding -> add
{
let signing_builder = SignatureBuilder::new(SignatureType::PositiveCertification)
.set_signature_creation_time(SystemTime::now())?
.set_key_validity_period(std::time::Duration::new(0, 0))?
.set_key_flags(
// Flags for primary key
KeyFlags::empty().set_signing().set_certification(),
)?;
// 7) make, sign binding -> add // Allow signing on the card
{ if let Some(pw1) = pw1 {
let signing_builder = SignatureBuilder::new(SignatureType::PositiveCertification) open.verify_user_for_signing(pw1)?;
.set_signature_creation_time(SystemTime::now())? } else {
.set_key_validity_period(std::time::Duration::new(0, 0))? open.verify_user_for_signing_pinpad(prompt)?;
.set_key_flags( }
// Flags for primary key
KeyFlags::empty().set_signing().set_certification(),
)?;
// Allow signing on the card if let Some(mut sign) = open.signing_card() {
if let Some(pw1) = pw1 { // Card-backed signer for bindings
open.verify_user_for_signing(pw1)?; let mut card_signer = sign.signer_from_pubkey(key_sig);
} else {
open.verify_user_for_signing_pinpad(prompt)?;
}
if let Some(mut sign) = open.signing_card() { // Temporary version of the cert
// Card-backed signer for bindings let cert = Cert::try_from(pp.clone())?;
let mut card_signer = sign.signer_from_pubkey(key_sig);
// Temporary version of the cert let signing_bsig: Packet =
let cert = Cert::try_from(pp.clone())?; 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);
} }
} }