X-Git-Url: http://www.average.org/gitweb/?p=pam_pcsc_cr.git;a=blobdiff_plain;f=pcsc_cr.c;h=48c79f8443e29a8942f7469409f6e8a96eb98acf;hp=0354c32023e7ddfeb58fe1265bf1f8a462c9746a;hb=7b6aa201f4bd4aaf7f7a83677f7fd6f316dde07e;hpb=7c4066e68330f89016e939a6ad34036f9e00c11d

diff --git a/pcsc_cr.c b/pcsc_cr.c
index 0354c32..48c79f8 100644
--- a/pcsc_cr.c
+++ b/pcsc_cr.c
@@ -1,4 +1,9 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <stdio.h>
 #include <string.h>
+#include <alloca.h>
 #include "token.h"
 #include <reader.h>
 
@@ -11,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;
@@ -32,7 +37,8 @@ static LONG find_hb(LPTSTR atr, DWORD atrsize, LPTSTR *hb, LPDWORD hbsize)
 	return SCARD_S_SUCCESS;
 }
 
-long pcsc_cr(unsigned char *chal, int csize, unsigned char *resp, int *rsize)
+long pcsc_cr(const unsigned char *chal, const int csize,
+		unsigned char *resp, int *rsize)
 {
 	struct token_interface *type;
 	LONG rc;
@@ -42,7 +48,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;
@@ -76,17 +82,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, (BYTE*)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:
@@ -97,3 +112,26 @@ free_out:
 char *pcsc_errstr(long err) {
 	return pcsc_stringify_error(err);
 }
+
+int pcsc_option(const char *option)
+{
+	char *name, *key, *val;
+	int i, rc = -1;
+	struct token_interface *type;
+
+	name=(char *)alloca(strlen(option)+1);
+	strcpy(name, option);
+	if ((key = strchr(name, ':'))) *(key++) = '\0';
+	else return -1;
+	if ((val = strchr(key, '='))) *(val++) = '\0';
+	else return -1;
+	if (*val == '\0') return -1;
+	for (i = 0; types[i]; i++) {
+		type = types[i];
+		if (!strcmp(type->name,name)) {
+			rc = type->parse_option(key, val);
+			break;
+		}
+	}
+	return rc;
+}