rename test chalresp

[pam_pcsc_cr.git] / pcsc_cr.c

diff --git a/pcsc_cr.c b/pcsc_cr.c
index 0354c32023e7ddfeb58fe1265bf1f8a462c9746a..52a18e7d9dbcf275f0ab675c96fc3f28856847f0 100644 (file)
--- 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 <string.h>

+#include <alloca.h>

 #include "token.h"
 #include <reader.h>
 
 #include "token.h"
 #include <reader.h>
 


@@ -11,7 +16,7 @@ static struct token_interface *types[] = {
 
 SCARD_IO_REQUEST pioSendPci;
 
 
 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;
 {
        int i, j, cont;
        if (atrsize < 2) return SCARD_W_UNSUPPORTED_CARD;


@@ -42,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;
        DWORD nrdrs = SCARD_AUTOALLOCATE, activeproto;
        BYTE atr[33];
        DWORD atrsize;

-       LPTSTR hb;
+       BYTE *hb;

        DWORD hbsize;
        DWORD lrsize;
        int i;
        DWORD hbsize;
        DWORD lrsize;
        int i;


@@ -76,17 +81,17 @@ long pcsc_cr(unsigned char *chal, int csize, unsigned char *resp, int *rsize)
                        if (rc == 0) break;
                }
                if (rc) goto disconnect;
                        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;
        lrsize = *rsize;
                if (rc == 0) break;
        disconnect:
                (void)SCardDisconnect(hCard, SCARD_LEAVE_CARD);
        }
        if (rc) goto free_out;
        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;
        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:
 disc_free_out:
        (void)SCardDisconnect(hCard, SCARD_EJECT_CARD);
 free_out:


@@ -97,3 +102,26 @@ free_out:
 char *pcsc_errstr(long err) {
        return pcsc_stringify_error(err);
 }
 char *pcsc_errstr(long err) {
        return pcsc_stringify_error(err);
 }

+
+int pcsc_option(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;
+}