From 0103a53aa6dbd434e4b85c3176b6a4304ea0f040 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Wed, 17 Nov 2010 13:21:24 +0000
Subject: Smartcard related updates

---
 g10/misc.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'g10/misc.c')

diff --git a/g10/misc.c b/g10/misc.c
index cbbba9bc3..b3b73ed67 100644
--- a/g10/misc.c
+++ b/g10/misc.c
@@ -548,13 +548,12 @@ static unsigned long
 get_signature_count (PKT_public_key *pk)
 {
 #ifdef ENABLE_CARD_SUPPORT
-  /* FIXME: Need to call the agent.  */
-  /* if(sk && sk->is_protected && sk->protect.s2k.mode==1002) */
-  /*   { */
-  /*     struct agent_card_info_s info; */
-  /*     if(agent_scd_getattr("SIG-COUNTER",&info)==0) */
-  /*       return info.sig_counter; */
-  /*   }   */
+  struct agent_card_info_s info;
+#warning fixme: We should check that the correct card has been inserted
+  if (!agent_scd_getattr ("SIG-COUNTER",&info))
+    return info.sig_counter;
+  else
+    return 0;
 #else
   (void)pk;
   return 0;
-- 
cgit v1.2.3