From 247bec6a6f6a3358b38818a972430c7329f5b0d9 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Tue, 26 Mar 2013 09:03:55 +0900 Subject: [PATCH] scd: PC/SC cleanup (more). * scd/apdu.c (control_pcsc_direct, control_pcsc_wrapped, control_pcsc) (check_pcsc_pinpad, pcsc_pinpad_verify, pcsc_pinpad_modify): Use pcsc_dword_t. --- scd/apdu.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scd/apdu.c b/scd/apdu.c index 4734b1213..d8f7c5fd9 100644 --- a/scd/apdu.c +++ b/scd/apdu.c @@ -1232,7 +1232,7 @@ pcsc_send_apdu (int slot, unsigned char *apdu, size_t apdulen, static int control_pcsc_direct (int slot, pcsc_dword_t ioctl_code, const unsigned char *cntlbuf, size_t len, - unsigned char *buffer, size_t *buflen) + unsigned char *buffer, pcsc_dword_t *buflen) { long err; @@ -1254,7 +1254,7 @@ control_pcsc_direct (int slot, pcsc_dword_t ioctl_code, static int control_pcsc_wrapped (int slot, pcsc_dword_t ioctl_code, const unsigned char *cntlbuf, size_t len, - unsigned char *buffer, size_t *buflen) + unsigned char *buffer, pcsc_dword_t *buflen) { long err = PCSC_E_NOT_TRANSACTED; reader_table_t slotp; @@ -1362,7 +1362,7 @@ control_pcsc_wrapped (int slot, pcsc_dword_t ioctl_code, static int control_pcsc (int slot, pcsc_dword_t ioctl_code, const unsigned char *cntlbuf, size_t len, - unsigned char *buffer, size_t *buflen) + unsigned char *buffer, pcsc_dword_t *buflen) { #ifdef NEED_PCSC_WRAPPER return control_pcsc_wrapped (slot, ioctl_code, cntlbuf, len, buffer, buflen); @@ -2027,7 +2027,7 @@ static int check_pcsc_pinpad (int slot, int command, pininfo_t *pininfo) { unsigned char buf[256]; - size_t len = 256; + pcsc_dword_t len = 256; int sw; (void)pininfo; /* XXX: Identify reader and set pininfo->fixedlen. */ @@ -2088,7 +2088,7 @@ pcsc_pinpad_verify (int slot, int class, int ins, int p0, int p1, unsigned char *pin_verify; int len = PIN_VERIFY_STRUCTURE_SIZE + pininfo->fixedlen; unsigned char result[2]; - size_t resultlen = 2; + pcsc_dword_t resultlen = 2; if (!reader_table[slot].atrlen && (sw = reset_pcsc_reader (slot))) @@ -2169,7 +2169,7 @@ pcsc_pinpad_modify (int slot, int class, int ins, int p0, int p1, unsigned char *pin_modify; int len = PIN_MODIFY_STRUCTURE_SIZE + 2 * pininfo->fixedlen; unsigned char result[2]; - size_t resultlen = 2; + pcsc_dword_t resultlen = 2; if (!reader_table[slot].atrlen && (sw = reset_pcsc_reader (slot)))