From b2856d162e0a3c0b349a8490a281f66b27ac67d3 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Tue, 1 Nov 2011 11:02:22 +0900
Subject: [PATCH] added more DEBUG_XX

---
 src/openpgp-do.c | 4 ++++
 src/openpgp.c    | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/src/openpgp-do.c b/src/openpgp-do.c
index aa36a7b..13cc88c 100644
--- a/src/openpgp-do.c
+++ b/src/openpgp-do.c
@@ -627,6 +627,9 @@ gpg_do_load_prvkey (enum kind_of_key kk, int who, const uint8_t *keystring)
   uint8_t dek[DATA_ENCRYPTION_KEY_SIZE];
   struct key_data_internal kdi;
 
+  DEBUG_INFO ("Loading private key: ");
+  DEBUG_BYTE (kk);
+
   if (do_data == NULL)
     return 0;
 
@@ -646,6 +649,7 @@ gpg_do_load_prvkey (enum kind_of_key kk, int who, const uint8_t *keystring)
   /* more sanity check??? */
 
   memcpy (kd[kk].data, kdi.data, KEY_CONTENT_LEN);
+  DEBUG_BINARY (&kd[kk], KEY_CONTENT_LEN);
   return 1;
 }
 
diff --git a/src/openpgp.c b/src/openpgp.c
index 253de43..172bf22 100644
--- a/src/openpgp.c
+++ b/src/openpgp.c
@@ -726,6 +726,7 @@ cmd_pso (void)
 
   DEBUG_INFO (" - PSO: ");
   DEBUG_WORD ((uint32_t)&r);
+  DEBUG_BINARY (cmd_APDU, cmd_APDU_size);
 
   if (cmd_APDU[2] == 0x9e && cmd_APDU[3] == 0x9a)
     {
@@ -751,6 +752,7 @@ cmd_pso (void)
       else
 	{
 	  DEBUG_SHORT (len);  /* Should be cmd_APDU_size - 8 [- 1] */
+	  DEBUG_BINARY (&kd[GPG_KEY_FOR_SIGNING], KEY_CONTENT_LEN);
 
 	  r = rsa_sign (&cmd_APDU[data_start], res_APDU, len,
 			&kd[GPG_KEY_FOR_SIGNING]);
@@ -767,6 +769,7 @@ cmd_pso (void)
   else if (cmd_APDU[2] == 0x80 && cmd_APDU[3] == 0x86)
     {
       DEBUG_SHORT (len);
+      DEBUG_BINARY (&kd[GPG_KEY_FOR_DECRYPTION], KEY_CONTENT_LEN);
 
       if (!ac_check_status (AC_OTHER_AUTHORIZED))
 	{