From 87a80a4797f0db1f0196ec5642720f6c718b84c1 Mon Sep 17 00:00:00 2001
From: Heiko Schaefer <heiko@schaefer.name>
Date: Mon, 31 Oct 2022 18:13:26 +0100
Subject: [PATCH] opgpcard: rename "key_status" to "additional_key_status".

 This field will only contain data in rare cases (I don't know of a card where it will) when a card has key information for unusual key types (also see OpenPGP card spec 3.4.1 pg.43)
---
 tools/src/bin/opgpcard/commands/status.rs |  5 ++++-
 tools/src/bin/opgpcard/output/status.rs   | 17 ++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/tools/src/bin/opgpcard/commands/status.rs b/tools/src/bin/opgpcard/commands/status.rs
index 5d1f2e1..2229395 100644
--- a/tools/src/bin/opgpcard/commands/status.rs
+++ b/tools/src/bin/opgpcard/commands/status.rs
@@ -199,7 +199,10 @@ pub fn print_status(
         for i in 0..num {
             // 0x81 is the Yubico attestation key, it has already been used above -> skip here
             if ki.additional_ref(i) != 0x81 {
-                output.key_status(ki.additional_ref(i), ki.additional_status(i).to_string());
+                output.additional_key_status(
+                    ki.additional_ref(i),
+                    ki.additional_status(i).to_string(),
+                );
             }
         }
     }
diff --git a/tools/src/bin/opgpcard/output/status.rs b/tools/src/bin/opgpcard/output/status.rs
index 9b1e726..b04dcaa 100644
--- a/tools/src/bin/opgpcard/output/status.rs
+++ b/tools/src/bin/opgpcard/output/status.rs
@@ -24,7 +24,7 @@ pub struct Status {
     user_pin_remaining_attempts: u8,
     admin_pin_remaining_attempts: u8,
     reset_code_remaining_attempts: u8,
-    key_statuses: Vec<(u8, String)>,
+    additional_key_statuses: Vec<(u8, String)>,
     ca_fingerprints: Vec<String>,
 }
 
@@ -93,8 +93,8 @@ impl Status {
         self.reset_code_remaining_attempts = count;
     }
 
-    pub fn key_status(&mut self, keyref: u8, status: String) {
-        self.key_statuses.push((keyref, status));
+    pub fn additional_key_status(&mut self, keyref: u8, status: String) {
+        self.additional_key_statuses.push((keyref, status));
     }
 
     pub fn ca_fingerprint(&mut self, fingerprint: String) {
@@ -182,8 +182,11 @@ impl Status {
         ));
 
         if self.verbose {
-            for (keyref, status) in self.key_statuses.iter() {
-                s.push_str(&format!("Key status (#{}): {}\n", keyref, status));
+            for (keyref, status) in self.additional_key_statuses.iter() {
+                s.push_str(&format!(
+                    "Additional key status (#{}): {}\n",
+                    keyref, status
+                ));
             }
         }
 
@@ -207,7 +210,7 @@ impl Status {
             user_pin_remaining_attempts: self.user_pin_remaining_attempts,
             admin_pin_remaining_attempts: self.admin_pin_remaining_attempts,
             reset_code_remaining_attempts: self.reset_code_remaining_attempts,
-            // key_statuses: self.key_statuses.clone(),
+            additional_key_statuses: self.additional_key_statuses.clone(),
             // ca_fingerprints: self.ca_fingerprints.clone(),
         })
     }
@@ -256,7 +259,7 @@ pub struct StatusV0 {
     user_pin_remaining_attempts: u8,
     admin_pin_remaining_attempts: u8,
     reset_code_remaining_attempts: u8,
-    // key_statuses: Vec<(u8, String)>, // TODO: add to JSON output after clarifying the content
+    additional_key_statuses: Vec<(u8, String)>,
     // ca_fingerprints: Vec<String>, // TODO: add to JSON output after clarifying the content
 }