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

Don't implicitly add a User ID for the cardholder name, in make_cert()

Browse source
This commit is contained in:
Heiko Schaefer 2022-09-18 15:29:08 +02:00
parent 9734ed5dc9
commit b32cf67196
No known key found for this signature in database
GPG key ID: 4A849A1904CCBD7D
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -59,8 +59,6 @@ pub fn make_cert<'app>(
) -> Result<Cert> { ) -> Result<Cert> {
let mut pp = vec![]; let mut pp = vec![];
let cardholder = open.cardholder_related_data()?;
// helper: use the card to perform a signing operation // helper: use the card to perform a signing operation
let mut sign_on_card = let mut sign_on_card =
|op: &mut dyn Fn(&mut dyn sequoia_openpgp::crypto::Signer) -> Result<Signature>| { |op: &mut dyn Fn(&mut dyn sequoia_openpgp::crypto::Signer) -> Result<Signature>| {
@ -136,14 +134,8 @@ pub fn make_cert<'app>(
pp.push(s.into()); pp.push(s.into());
} }
// 6) add user id from cardholder name (if a name is set on the card), plus any User IDs that // 6) add `user_ids`.
// were explicitly passed as a parameter. for uid in user_ids.iter().map(|uid| uid.as_bytes()) {
for uid in user_ids
.iter()
.map(|uid| uid.as_bytes())
.chain(cardholder.name())
.filter(|uid| !uid.is_empty())
{
let uid: UserID = uid.into(); let uid: UserID = uid.into();
pp.push(uid.clone().into()); pp.push(uid.clone().into());