X-Git-Url: http://www.average.org/gitweb/?p=pam_pcsc_cr.git;a=blobdiff_plain;f=pcsc_cr.c;h=b457cd85025a852e70a89448ac1b7283f6fec022;hp=0559212e1e6946f480623ebb6a0162b82a7cb808;hb=2961e53fa16c04cbb2e90015d68a0b9454c2edd6;hpb=0894042d90da9c8ad0d03e875c727442e778a7d6

diff --git a/pcsc_cr.c b/pcsc_cr.c
index 0559212..b457cd8 100644
--- a/pcsc_cr.c
+++ b/pcsc_cr.c
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 #include <stdio.h>
 #include <string.h>
 #include <alloca.h>
@@ -13,7 +16,7 @@ static struct token_interface *types[] = {
 
 SCARD_IO_REQUEST pioSendPci;
 
-static LONG find_hb(LPTSTR atr, DWORD atrsize, LPTSTR *hb, LPDWORD hbsize)
+static LONG find_hb(BYTE *atr, DWORD atrsize, BYTE **hb, LPDWORD hbsize)
 {
 	int i, j, cont;
 	if (atrsize < 2) return SCARD_W_UNSUPPORTED_CARD;
@@ -44,7 +47,7 @@ long pcsc_cr(unsigned char *chal, int csize, unsigned char *resp, int *rsize)
 	DWORD nrdrs = SCARD_AUTOALLOCATE, activeproto;
 	BYTE atr[33];
 	DWORD atrsize;
-	LPTSTR hb;
+	BYTE *hb;
 	DWORD hbsize;
 	DWORD lrsize;
 	int i;
@@ -78,17 +81,26 @@ long pcsc_cr(unsigned char *chal, int csize, unsigned char *resp, int *rsize)
 			if (rc == 0) break;
 		}
 		if (rc) goto disconnect;
-		rc = type->prologue(hCard, NULL);
+		rc = type->prologue(hCard);
 		if (rc == 0) break;
 	disconnect:
 		(void)SCardDisconnect(hCard, SCARD_LEAVE_CARD);
 	}
 	if (rc) goto free_out;
+#if 0
+	char serial[16];
+	memset(serial, 'z', sizeof(serial));
+	serial[sizeof(serial) - 1] - '\0';
+	lrsize = sizeof(serial);
+	rc = type->getserial(hCard, &serial, &lrsize);
+	if (rc) goto disc_free_out;
+	printf("Serial is %s\n", serial);
+#endif
 	lrsize = *rsize;
-	rc = type->trancieve(hCard, NULL, chal, csize, resp, &lrsize);
+	rc = type->trancieve(hCard, chal, csize, resp, &lrsize);
 	if (rc) goto disc_free_out;
 	*rsize = lrsize;
-	rc = type->epilogue(hCard, NULL);
+	rc = type->epilogue(hCard);
 disc_free_out:
 	(void)SCardDisconnect(hCard, SCARD_EJECT_CARD);
 free_out: