From c4182e3e24546c248f932d9acd46b79105841f38 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Wed, 17 Dec 2003 12:27:51 +0000
Subject: [PATCH] Replaced deprecated type names.

* card-p15.c (p15_enum_keypairs): Replaced KRC by RC.
* card-dinsig.c (dinsig_enum_keypairs): Ditto.
---
 scd/ChangeLog     |  5 +++++
 scd/card-common.h |  2 +-
 scd/card-dinsig.c | 11 +++++------
 scd/card-p15.c    | 11 +++++------
 scd/card.c        |  4 ++--
 scd/ccid-driver.c |  2 +-
 scd/command.c     |  4 ++--
 7 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/scd/ChangeLog b/scd/ChangeLog
index 6b9654f58..60b5f8eb9 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-17  Werner Koch  <wk@gnupg.org>
+
+	* card-p15.c (p15_enum_keypairs): Replaced KRC by RC.
+	* card-dinsig.c (dinsig_enum_keypairs): Ditto.
+
 2003-12-16  Werner Koch  <wk@gnupg.org>
 
 	* scdaemon.c (main): Set the prefixes for assuan logging.
diff --git a/scd/card-common.h b/scd/card-common.h
index 31f0dfe8f..cefaf120f 100644
--- a/scd/card-common.h
+++ b/scd/card-common.h
@@ -60,7 +60,7 @@ struct card_ctx_s {
 
 /*-- card.c --*/
 gpg_error_t map_sc_err (int rc);
-int card_help_get_keygrip (KsbaCert cert, unsigned char *array);
+int card_help_get_keygrip (ksba_cert_t cert, unsigned char *array);
 
 /*-- card-15.c --*/
 void p15_release_private_data (CARD card);
diff --git a/scd/card-dinsig.c b/scd/card-dinsig.c
index 18a67abb6..bb070d5f0 100644
--- a/scd/card-dinsig.c
+++ b/scd/card-dinsig.c
@@ -99,8 +99,7 @@ dinsig_enum_keypairs (CARD card, int idx,
   int rc;
   unsigned char *buf;
   size_t buflen;
-  KsbaError krc;
-  KsbaCert cert;
+  ksba_cert_t cert;
 
   /* fixme: We should locate the application via the EF(DIR) and not
      assume a Netkey card */
@@ -120,14 +119,14 @@ dinsig_enum_keypairs (CARD card, int idx,
       return rc;
     }
 
-  krc = ksba_cert_init_from_mem (cert, buf, buflen); 
+  rc = ksba_cert_init_from_mem (cert, buf, buflen); 
   xfree (buf);
-  if (krc)
+  if (rc)
     {
       log_error ("failed to parse the certificate at idx %d: %s\n",
-                 idx, gpg_strerror (krc));
+                 idx, gpg_strerror (rc));
       ksba_cert_release (cert);
-      return krc;
+      return rc;
     }
   if (card_help_get_keygrip (cert, keygrip))
     {
diff --git a/scd/card-p15.c b/scd/card-p15.c
index 33c58e2c8..239e75045 100644
--- a/scd/card-p15.c
+++ b/scd/card-p15.c
@@ -109,14 +109,13 @@ p15_enum_keypairs (CARD card, int idx,
                    unsigned char *keygrip, char **keyid)
 {
   int rc;
-  KsbaError krc;
   struct p15private_s *priv;
   struct sc_pkcs15_object *tmpobj;
   int nobjs;
   struct sc_pkcs15_prkey_info *pinfo;
   struct sc_pkcs15_cert_info *certinfo;
   struct sc_pkcs15_cert      *certder;
-  KsbaCert cert;
+  ksba_cert_t cert;
 
   rc = init_private_data (card);
   if (rc) 
@@ -154,14 +153,14 @@ p15_enum_keypairs (CARD card, int idx,
       sc_pkcs15_free_certificate (certder);
       return rc;
     }
-  krc = ksba_cert_init_from_mem (cert, certder->data, certder->data_len);
+  rc = ksba_cert_init_from_mem (cert, certder->data, certder->data_len);
   sc_pkcs15_free_certificate (certder);
-  if (krc)
+  if (rc)
     {
       log_error ("failed to parse the certificate for private key %d: %s\n",
-                 idx, gpg_strerror (krc));
+                 idx, gpg_strerror (rc));
       ksba_cert_release (cert);
-      return krc;
+      return rc;
     }
   if (card_help_get_keygrip (cert, keygrip))
     {
diff --git a/scd/card.c b/scd/card.c
index 042613294..95149074d 100644
--- a/scd/card.c
+++ b/scd/card.c
@@ -58,11 +58,11 @@ map_sc_err (int rc)
 
 /* Get the keygrip from CERT, return 0 on success */
 int
-card_help_get_keygrip (KsbaCert cert, unsigned char *array)
+card_help_get_keygrip (ksba_cert_t cert, unsigned char *array)
 {
   gcry_sexp_t s_pkey;
   int rc;
-  KsbaSexp p;
+  ksba_sexp_t p;
   size_t n;
   
   p = ksba_cert_get_public_key (cert);
diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index 099dae240..936672cc6 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -133,7 +133,7 @@
 
 
 /* Define to print information pertaining the T=1 protocol. */
-#undef DEBUG_T1 1
+#undef DEBUG_T1 
 
 
 
diff --git a/scd/command.c b/scd/command.c
index 122a2f3c1..bc3132a0b 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -437,8 +437,8 @@ cmd_readkey (ASSUAN_CONTEXT ctx, char *line)
   int rc;
   unsigned char *cert = NULL;
   size_t ncert, n;
-  KsbaCert kc = NULL;
-  KsbaSexp p;
+  ksba_cert_t kc = NULL;
+  ksba_sexp_t p;
 
   if ((rc = open_card (ctrl)))
     return rc;