From 55696346c980392d0da0dbbcb49acbba4de677b6 Mon Sep 17 00:00:00 2001
From: Heiko Schaefer <heiko@schaefer.name>
Date: Fri, 15 Apr 2022 17:45:10 +0200
Subject: [PATCH] Use Display trait to print card information

---
 tools/src/bin/opgpcard/main.rs | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/tools/src/bin/opgpcard/main.rs b/tools/src/bin/opgpcard/main.rs
index e82ebce..bf8af49 100644
--- a/tools/src/bin/opgpcard/main.rs
+++ b/tools/src/bin/opgpcard/main.rs
@@ -328,22 +328,33 @@ fn print_info(ident: Option<String>) -> Result<()> {
     let mut pgp = OpenPgp::new(&mut *card);
     let mut open = Open::new(pgp.transaction()?)?;
 
-    print!("OpenPGP card {}", open.application_identifier()?.ident());
-
     let ai = open.application_identifier()?;
+
+    print!("OpenPGP card {}", ai.ident());
+
     let version = ai.version().to_be_bytes();
     println!(" (card version {}.{})\n", version[0], version[1]);
 
+    println!("Application Identifier: {}", ai);
+    println!(
+        "Manufacturer [{:04X}]: {}\n",
+        ai.manufacturer(),
+        ai.manufacturer_name()
+    );
+
     if let Some(cc) = open.historical_bytes()?.card_capabilities() {
-        println!("{:#?}\n", cc);
+        println!("Card Capabilities:\n{}", cc);
+    }
+    if let Some(csd) = open.historical_bytes()?.card_service_data() {
+        println!("Card service data:\n{}", csd);
     }
 
     if let Some(eli) = open.extended_length_information()? {
-        println!("{:#?}\n", eli);
+        println!("Extended Length Info:\n{}", eli);
     }
 
     let ec = open.extended_capabilities()?;
-    println!("{:#?}\n", ec);
+    println!("Extended Capabilities:\n{}", ec);
 
     // Algorithm information (list of supported algorithms)
     if let Ok(Some(ai)) = open.algorithm_information() {