From 202c8e5227ee85e3567183b82f423559098ef1a0 Mon Sep 17 00:00:00 2001
From: jey <jey@c6295689-39f2-0310-b995-f0e70906c6a9>
Date: Sun, 21 Oct 2001 18:12:48 +0000
Subject: [PATCH] - given ASN.1 decoding routines a facelift - implemented
 certificate enumeration

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@13 c6295689-39f2-0310-b995-f0e70906c6a9
---
 src/pkcs11/slot.c    |  4 ++--
 src/tests/hst-test.c | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/pkcs11/slot.c b/src/pkcs11/slot.c
index b0c73c2d..b16c91a9 100644
--- a/src/pkcs11/slot.c
+++ b/src/pkcs11/slot.c
@@ -64,7 +64,7 @@ static CK_ATTRIBUTE certificate[] = {
 int slot_connect(int id)
 {
 	struct sc_card *card;
-	struct sc_pkcs15_pin_object pin;
+	struct sc_pkcs15_pin_info pin;
 	int r, c = 0;
 
 	r = sc_connect_card(ctx, id, &card);
@@ -81,7 +81,7 @@ int slot_connect(int id)
 		return CKR_TOKEN_NOT_RECOGNIZED;
 	}
 
-	while (sc_pkcs15_read_pin_object(slot[id].p15card, ++c, &pin) == 0);
+	while (sc_pkcs15_read_pin_info(slot[id].p15card, ++c, &pin) == 0);
 	LOG("Found total of %d PIN codes.\n", c);
 	slot[id].flags = SLOT_CONNECTED;
 
diff --git a/src/tests/hst-test.c b/src/tests/hst-test.c
index 1e3f8552..cd55acd5 100644
--- a/src/tests/hst-test.c
+++ b/src/tests/hst-test.c
@@ -12,7 +12,7 @@ int main(int argc, char **argv) {
   struct sc_context *ctx = NULL;
   struct sc_card *card = NULL;
   struct sc_pkcs15_card *p15_card = NULL;
-  struct sc_pkcs15_pin_object pin;
+  struct sc_pkcs15_pin_info pin;
   char buf[16], buf2[16];
   
   int i,c ;
@@ -51,20 +51,22 @@ int main(int argc, char **argv) {
     return 1;
   }
   sc_pkcs15_print_card(p15_card);
-  return 0;
-  i = sc_pkcs15_read_certificate(p15_card, 0);
-  if (i) {
-    fprintf(stderr, "Certificate read failed with %d\n", i);
+  i = sc_pkcs15_enum_certificates(p15_card);
+  if (i < 0) {
+    fprintf(stderr, "Certificate enumeration failed with %s\n", sc_strerror(i));
     return 1;
   }
-
+  printf("%d certificates found.\n", i);
+  for (i = 0; i < p15_card->cert_count; i++)
+  	sc_pkcs15_print_cert_info(&p15_card->cert_info[i]);
+  
   return 0;
 
   printf("Searching for PIN codes...\n");
 
   c = 0;
-  while (sc_pkcs15_read_pin_object(p15_card, ++c, &pin) == 0) {
-  	sc_pkcs15_print_pin_object(&pin);
+  while (sc_pkcs15_read_pin_info(p15_card, ++c, &pin) == 0) {
+  	sc_pkcs15_print_pin_info(&pin);
   }
   c--;
   if (c == 0) {