From d27f0d5f83c8b39cd6436827f1421cd04794ef8f Mon Sep 17 00:00:00 2001
From: Hatter Jiang <jht5945@gmail.com>
Date: Sat, 11 Jan 2025 22:31:50 +0800
Subject: [PATCH] feat: v1.10.15, add debuging

---
 Cargo.lock            |  2 +-
 Cargo.toml            |  2 +-
 src/cmd_sshpivsign.rs | 17 ++++++++++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d368b2e..e9ce80e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -487,7 +487,7 @@ dependencies = [
 
 [[package]]
 name = "card-cli"
-version = "1.10.14"
+version = "1.10.15"
 dependencies = [
  "authenticator 0.3.1",
  "base64 0.21.7",
diff --git a/Cargo.toml b/Cargo.toml
index cb75b55..e614f71 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "card-cli"
-version = "1.10.14"
+version = "1.10.15"
 authors = ["Hatter Jiang <jht5945@gmail.com>"]
 edition = "2018"
 
diff --git a/src/cmd_sshpivsign.rs b/src/cmd_sshpivsign.rs
index 34cd2c1..455e008 100644
--- a/src/cmd_sshpivsign.rs
+++ b/src/cmd_sshpivsign.rs
@@ -88,30 +88,37 @@ impl Command for CommandImpl {
         sign_message.write_string(namespace.as_bytes());
         sign_message.write_string("".as_bytes());
         sign_message.write_string("sha512".as_bytes());
-        sign_message.write_string(&crate::digest::sha512_bytes(&data));
+        let data_digest = crate::digest::sha512_bytes(&data);
+        debugging!("Data digest: {} (sha512)", hex::encode(&data_digest));
+        sign_message.write_string(&data_digest);
+        debugging!("Singed message: {}", hex::encode(&sign_message));
         let tobe_signed_data = if ec_bit_len == 256 {
             crate::digest::sha256_bytes(&sign_message)
         } else {
             crate::digest::sha384_bytes(&sign_message)
         };
+        debugging!("Digest of signed message: {}", hex::encode(&tobe_signed_data));
 
         if let Some(pin) = &pin_opt {
             opt_result!(yk.verify_pin(pin.as_bytes()), "YubiKey verify pin failed: {}");
         }
         let mut signature_value = vec![];
         let signed_data = opt_result!(sign_data(&mut yk, &tobe_signed_data, algorithm_id, slot_id), "Sign PIV failed: {}");
+        debugging!("Signature: {}", hex::encode(signed_data.as_slice()));
         let (_, parsed_signature) = opt_result!(der_parser::parse_der(signed_data.as_slice()), "Parse signature failed: {}");
         match parsed_signature.content {
             BerObjectContent::Sequence(seq) => {
                 match &seq[0].content {
-                    BerObjectContent::Integer(x) => {
-                        signature_value.write_string(x);
+                    BerObjectContent::Integer(r) => {
+                        debugging!("Signature r: {}", hex::encode(r));
+                        signature_value.write_string(r);
                     }
                     _ => return simple_error!("Parse signature failed: [0]not integer"),
                 }
                 match &seq[1].content {
-                    BerObjectContent::Integer(y) => {
-                        signature_value.write_string(y);
+                    BerObjectContent::Integer(s) => {
+                        debugging!("Signature s: {}", hex::encode(s));
+                        signature_value.write_string(s);
                     }
                     _ => return simple_error!("Parse signature failed: [1]not integer"),
                 }