+/*
+Copyright (c) 2013 Eugene Crosser
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must
+ not claim that you wrote the original software. If you use this
+ software in a product, an acknowledgment in the product documentation
+ would be appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must
+ not be misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source
+ distribution.
+*/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <stdio.h>
#include <string.h>
+#include <alloca.h>
#include "token.h"
#include <reader.h>
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;
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;
DWORD nrdrs = SCARD_AUTOALLOCATE, activeproto;
BYTE atr[33];
DWORD atrsize;
- LPTSTR hb;
+ BYTE *hb;
DWORD hbsize;
DWORD lrsize;
int i;
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:
return rc;
}
-char *pcsc_errstr(long err) {
+const 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;
+}