From b32cf67196e62c1e9d1304f9d58e2d91c3fbd775 Mon Sep 17 00:00:00 2001 From: Heiko Schaefer Date: Sun, 18 Sep 2022 15:29:08 +0200 Subject: [PATCH] Don't implicitly add a User ID for the cardholder name, in make_cert() --- openpgp-card-sequoia/src/util.rs | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/openpgp-card-sequoia/src/util.rs b/openpgp-card-sequoia/src/util.rs index 077a89f..e32dea3 100644 --- a/openpgp-card-sequoia/src/util.rs +++ b/openpgp-card-sequoia/src/util.rs @@ -59,8 +59,6 @@ pub fn make_cert<'app>( ) -> Result { let mut pp = vec![]; - let cardholder = open.cardholder_related_data()?; - // helper: use the card to perform a signing operation let mut sign_on_card = |op: &mut dyn Fn(&mut dyn sequoia_openpgp::crypto::Signer) -> Result| { @@ -136,14 +134,8 @@ pub fn make_cert<'app>( pp.push(s.into()); } - // 6) add user id from cardholder name (if a name is set on the card), plus any User IDs that - // were explicitly passed as a parameter. - for uid in user_ids - .iter() - .map(|uid| uid.as_bytes()) - .chain(cardholder.name()) - .filter(|uid| !uid.is_empty()) - { + // 6) add `user_ids`. + for uid in user_ids.iter().map(|uid| uid.as_bytes()) { let uid: UserID = uid.into(); pp.push(uid.clone().into());