add test for serializer

[pam_pcsc_cr.git] / pcsc_cr.c

diff --git a/pcsc_cr.c b/pcsc_cr.c
index 0559212e1e6946f480623ebb6a0162b82a7cb808..52a18e7d9dbcf275f0ab675c96fc3f28856847f0 100644 (file)
--- 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,17 @@ 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;
        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: