From 418bfc83f0137b8313700642c695d5db14bf6da3 Mon Sep 17 00:00:00 2001
From: Heiko Schaefer <heiko@schaefer.name>
Date: Wed, 30 Mar 2022 01:40:14 +0200
Subject: [PATCH] Make name optional in make_cert()

---
 openpgp-card-sequoia/src/util.rs | 57 ++++++++++++++++----------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/openpgp-card-sequoia/src/util.rs b/openpgp-card-sequoia/src/util.rs
index 590b9c7..90d957f 100644
--- a/openpgp-card-sequoia/src/util.rs
+++ b/openpgp-card-sequoia/src/util.rs
@@ -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()?;
 
-    // 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
-    {
-        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(),
-            )?;
+            // Allow signing on the card
+            if let Some(pw1) = pw1 {
+                open.verify_user_for_signing(pw1)?;
+            } else {
+                open.verify_user_for_signing_pinpad(prompt)?;
+            }
 
-        // Allow signing on the card
-        if let Some(pw1) = pw1 {
-            open.verify_user_for_signing(pw1)?;
-        } else {
-            open.verify_user_for_signing_pinpad(prompt)?;
-        }
+            if let Some(mut sign) = open.signing_card() {
+                // Card-backed signer for bindings
+                let mut card_signer = sign.signer_from_pubkey(key_sig);
 
-        if let Some(mut sign) = open.signing_card() {
-            // Card-backed signer for bindings
-            let mut card_signer = sign.signer_from_pubkey(key_sig);
+                // Temporary version of the cert
+                let cert = Cert::try_from(pp.clone())?;
 
-            // Temporary version of the cert
-            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);
+            }
         }
     }