[Pcsclite-muscle] RFC support for HID Omnikey 2061 Bluetooth reader
James
pcsclite
Mon Feb 6 03:30:45 PST 2017
On Mon, Feb 06, 2017 at 10:19:49AM +0000, James wrote:
> This is a usb/bluetooth card reader, easily available from ebay &c.
>
> https://www.hidglobal.com/products/readers/omnikey/2061
This version automatically sets up the rfcomm connexion:
/etc/reader.conf.d/hid2061 might contain
DEVICENAME 00:80:25:XX:XX;XX
FRIENDLYNAME "hid2061"
LIBPATH /usr/lib64/pcsc/drivers/serial/libccidhid.so
It handles automatic connexion and disconnexion as the
bluetooth device is available or not.
If the bluetooth device is not reachable, it fakes
the replies to GetSlotStatus, so that pcscd is able
to start up.
James.
-------------- next part --------------
diff --git a/.gitignore b/.gitignore
index 220a00b..96262ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,7 +71,7 @@ src/libccidtwin.la
src/libccidtwin_la-atr.lo
src/libccidtwin_la-buffer.lo
src/libccidtwin_la-ccid.lo
-src/libccidtwin_la-ccid_serial.lo
+src/libccidtwin_la-ccid_twin_serial.lo
src/libccidtwin_la-checksum.lo
src/libccidtwin_la-commands.lo
src/libccidtwin_la-ifdhandler.lo
@@ -81,6 +81,20 @@ src/libccidtwin_la-simclist.lo
src/libccidtwin_la-strlcpy.lo
src/libccidtwin_la-tokenparser.lo
src/libccidtwin_la-utils.lo
+src/libccidhid.la
+src/libccidhid_la-atr.lo
+src/libccidhid_la-buffer.lo
+src/libccidhid_la-ccid.lo
+src/libccidhid_la-ccid_hid_serial.lo
+src/libccidhid_la-checksum.lo
+src/libccidhid_la-commands.lo
+src/libccidhid_la-ifdhandler.lo
+src/libccidhid_la-pps.lo
+src/libccidhid_la-proto-t1.lo
+src/libccidhid_la-simclist.lo
+src/libccidhid_la-strlcpy.lo
+src/libccidhid_la-tokenparser.lo
+src/libccidhid_la-utils.lo
src/openct/.deps/
src/openct/.dirstamp
src/openct/.libs/
@@ -106,5 +120,10 @@ src/towitoko/libccid_la-atr.lo
src/towitoko/libccid_la-pps.lo
src/towitoko/libccidtwin_la-atr.lo
src/towitoko/libccidtwin_la-pps.lo
+src/openct/libccidhid_la-buffer.lo
+src/openct/libccidhid_la-checksum.lo
+src/openct/libccidhid_la-proto-t1.lo
+src/towitoko/libccidhid_la-atr.lo
+src/towitoko/libccidhid_la-pps.lo
stamp-h1
tags
diff --git a/configure.ac b/configure.ac
index 688c207..ec9211a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -204,6 +204,23 @@ if test "${ccidtwindir}" = false ; then
ccidtwindir=$usbdropdir/serial
fi
+
+# --enable-hidserial
+AC_ARG_ENABLE(hidserial,
+ AS_HELP_STRING([--enable-hidserial],[also compile and install the serial Twin driver]),
+ [hidserial="${enableval}"], [hidserial=no])
+AM_CONDITIONAL(WITH_HID_SERIAL, test "${hidserial}" != "no")
+
+# --enable-ccidhiddir=DIR
+AC_ARG_ENABLE(ccidhiddir,
+ AS_HELP_STRING([--enable-ccidhiddir=DIR],[directory to install the
+ serial Twin driver (default to pcscd config or $(prefix)/pcsc/drivers/serial)]),
+ [ccidhiddir="${enableval}"], [ccidhiddir=false])
+if test "${ccidhiddir}" = false ; then
+ ccidhiddir=$usbdropdir/serial
+fi
+
+
# --enable-serialconfdir=DIR
AC_ARG_ENABLE(serialconfdir,
AS_HELP_STRING([--enable-serialconfdir=dir],[directory containing
@@ -270,6 +287,7 @@ AC_SUBST(ac_aux_dir)
AC_SUBST(bundle)
AC_SUBST(usbdropdir)
AC_SUBST(ccidtwindir)
+AC_SUBST(ccidhiddir)
AC_SUBST(serialconfdir)
AS_AC_EXPAND(bindir_exp,$bindir)
AS_AC_EXPAND(sysconfdir_exp,$sysconfdir)
@@ -309,6 +327,8 @@ bundle directory name: ${bundle}
USB drop directory: ${usbdropdir}
serial Twin support: ${twinserial}
serial twin install dir: ${ccidtwindir}
+serial HID support: ${hidserial}
+serial HID install dir: ${ccidhiddir}
serial config directory: ${serialconfdir}
compiled for pcsc-lite: ${pcsclite}
syslog debug: ${use_syslog}
diff --git a/src/Makefile.am b/src/Makefile.am
index fcb5a61..e97db83 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,7 @@
CCID_BUNDLE = $(bundle)
CCID_LIB = libccid.$(DYN_LIB_EXT)
CCIDTWIN_LIB = libccidtwin.$(DYN_LIB_EXT)
+CCIDHID_LIB = libccidhid.$(DYN_LIB_EXT)
CCID_VERSION=CCID_VERSION=`$(srcdir)/convert_version.pl $(PACKAGE_VERSION)`
@@ -18,6 +19,11 @@ lib_LTLIBRARIES += libccidtwin.la
LIBS_TO_INSTALL += install_ccidtwin
LIBS_TO_UNINSTALL += uninstall_ccidtwin
endif
+if WITH_HID_SERIAL
+lib_LTLIBRARIES += libccidhid.la
+LIBS_TO_INSTALL += install_ccidhid
+LIBS_TO_UNINSTALL += uninstall_ccidhid
+endif
COMMON = ccid.c \
ccid.h \
@@ -30,7 +36,8 @@ COMMON = ccid.c \
utils.c \
utils.h
USB = ccid_usb.c ccid_usb.h
-SERIAL = ccid_serial.c ccid_serial.h
+TWIN_SERIAL = ccid_twin_serial.c ccid_twin_serial.h
+HID_SERIAL =ccid_hid_serial.c ccid_hid_serial.h
T1 = towitoko/atr.c \
towitoko/atr.h \
towitoko/defines.h \
@@ -59,13 +66,21 @@ libccid_la_CFLAGS = $(PCSC_CFLAGS) $(LIBUSB_CFLAGS) $(PTHREAD_CFLAGS) \
$(SYMBOL_VISIBILITY) -D$(CCID_VERSION) -DSIMCLIST_NO_DUMPRESTORE
libccid_la_LDFLAGS = -avoid-version
-libccidtwin_la_SOURCES = $(COMMON) $(SERIAL) $(TOKEN_PARSER) \
+libccidtwin_la_SOURCES = $(COMMON) $(TWIN_SERIAL) $(TOKEN_PARSER) \
$(PROVIDED_BY_PCSC) $(T1)
libccidtwin_la_CFLAGS = $(PCSC_CFLAGS) $(PTHREAD_CFLAGS) $(SYMBOL_VISIBILITY) \
-DTWIN_SERIAL -D$(CCID_VERSION) -DSIMCLIST_NO_DUMPRESTORE
libccidtwin_la_LIBADD = $(PTHREAD_LIBS)
libccidtwin_la_LDFLAGS = -avoid-version
+libccidhid_la_SOURCES = $(COMMON) $(HID_SERIAL) $(TOKEN_PARSER) \
+ $(PROVIDED_BY_PCSC) $(T1)
+libccidhid_la_CFLAGS = $(PCSC_CFLAGS) $(PTHREAD_CFLAGS) $(SYMBOL_VISIBILITY) \
+ -DHID_SERIAL -D$(CCID_VERSION) -DSIMCLIST_NO_DUMPRESTORE
+libccidhid_la_LIBADD = $(PTHREAD_LIBS)
+libccidhid_la_LDFLAGS = -avoid-version
+
+
parse_SOURCES = parse.c debug.c ccid_usb.c $(TOKEN_PARSER)
parse_LDADD = $(LIBUSB_LIBS)
parse_CFLAGS = $(PCSC_CFLAGS) $(LIBUSB_CFLAGS) -DSIMCLIST_NO_DUMPRESTORE
@@ -97,6 +112,11 @@ install_ccidtwin: libccidtwin.la
$(mkinstalldirs) $(DESTDIR)/$(serialconfdir) ; \
perl -ne "s|TARGET|$(ccidtwindir)/$(CCIDTWIN_LIB)| ; print" $(srcdir)/reader.conf.in > $(DESTDIR)/$(serialconfdir)/libccidtwin
+install_ccidhid: libccidhid.la
+ $(mkinstalldirs) $(DESTDIR)$(ccidhiddir)
+ cp .libs/$(CCIDHID_LIB) $(DESTDIR)$(ccidhiddir)/$(CCIDHID_LIB)
+
+
# do not uninstall the serial driver by default
# use explicitely 'make uninstall_ccidtwin'
uninstall: $(LIBS_TO_UNINSTALL)
@@ -108,3 +128,7 @@ uninstall_ccidtwin:
rm -f $(DESTDIR)$(ccidtwindir)/$(CCIDTWIN_LIB)
rm -f $(DESTDIR)/$(serialconfdir)/libccidtwin
+uninstall_ccidhid:
+ rm -f $(DESTDIR)$(ccidhiddir)/$(CCIDHID_LIB)
+ rm -f $(DESTDIR)/$(serialconfdir)/libccidhid
+
diff --git a/src/ccid.h b/src/ccid.h
index da0fd75..0bb9f75 100644
--- a/src/ccid.h
+++ b/src/ccid.h
@@ -213,6 +213,7 @@ typedef struct
#define ElatecTWN4 0x09D80427
#define SCM_SCL011 0x04E65293
#define HID_AVIATOR 0x076B3A21
+#define HID_OMNIKEY_2061 0x076b2061
#define VENDOR_GEMALTO 0x08E6
#define GET_VENDOR(readerID) ((readerID >> 16) & 0xFFFF)
diff --git a/src/ccid_hid_serial.c b/src/ccid_hid_serial.c
new file mode 100644
index 0000000..b072791
--- /dev/null
+++ b/src/ccid_hid_serial.c
@@ -0,0 +1,737 @@
+/*
+ * ccid_hid_serial.c: communicate with a GemPC Twin smart card reader
+ * Copyright (C) 2001-2010 Ludovic Rousseau <ludovic.rousseau at free.fr>
+ *
+ * Thanks to Niki W. Waibel <niki.waibel at gmx.net> for a prototype version
+ *
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <termios.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <ifdhandler.h>
+#include <bluetooth/bluetooth.h>
+#include <bluetooth/rfcomm.h>
+
+
+#include <config.h>
+#include "defs.h"
+#include "ccid_ifdhandler.h"
+#include "debug.h"
+#include "ccid.h"
+#include "utils.h"
+#include "commands.h"
+#include "parser.h"
+#include "strlcpycat.h"
+
+/*
+ * normal command:
+ * a5 <CCID command> <one byte checksum (XOR of a5+CCID bytes)>
+ *
+ * wake up command:
+ * a9 73 73
+ *
+ * normal replies
+ * a5 <CCID reply> <one byte checksum (XOR...) >
+ *
+ * replys to wakeup
+ *
+ * a9 74 74
+ *
+ * reply sent once after wakeup (voltage in BCD maybe?)
+ *
+ * a3 50 03 53
+ *
+ *
+ */
+
+#define HID_MAXBUF (271 +2 +1) * 2
+
+typedef struct
+{
+ /*
+ * File handle on the serial port
+ */
+ int fd;
+
+ /*
+ * device used ("/dev/ttyS?" under Linux)
+ */
+ /*@null@*/ char *device;
+
+ /*
+ * Number of slots using the same device
+ */
+ int real_nb_opened_slots;
+ int *nb_opened_slots;
+
+
+ /*
+ * serial communication buffer
+ */
+ unsigned char buffer[HID_MAXBUF];
+
+ /*
+ * next available byte
+ */
+ int buffer_offset;
+
+ /*
+ * number of available bytes
+ */
+ int buffer_offset_last;
+
+ int fake_empty;
+ unsigned char fake_empty_seq;
+
+
+ /*
+ * CCID infos common to USB and serial
+ */
+ _ccid_descriptor ccid;
+
+} _serialDevice;
+
+/* The _serialDevice structure must be defined before including ccid_serial.h */
+#include "ccid_hid_serial.h"
+
+
+unsigned int OMNIKey2061Rates[] ={ ISO_DATA_RATES , 0 };
+
+
+/* no need to initialize to 0 since it is static */
+static _serialDevice serialDevice[CCID_DRIVER_MAX_READERS];
+
+
+static int my_bachk(const char *str)
+{
+ if (!str)
+ return -1;
+
+ if (strlen(str) != 17)
+ return -1;
+
+ while (*str) {
+ if (!isxdigit(*str++))
+ return -1;
+
+ if (!isxdigit(*str++))
+ return -1;
+
+ if (*str == 0)
+ break;
+
+ if (*str++ != ':')
+ return -1;
+ }
+
+ return 0;
+}
+
+static int my_str2ba(const char *str, bdaddr_t *ba)
+{
+ int i;
+
+ if (my_bachk(str) < 0) {
+ memset(ba, 0, sizeof(*ba));
+ return -1;
+ }
+
+ for (i = 5; i >= 0; i--, str += 3)
+ ba->b[i] = strtol(str, NULL, 16);
+
+ return 0;
+}
+
+static int open_rfcomm(const char *addr)
+{
+ struct sockaddr_rc src_self = { 0 }, src_peer = { 0};
+ int fd;
+
+ src_self.rc_family = AF_BLUETOOTH;
+ bacpy (&src_self.rc_bdaddr, BDADDR_ANY);
+ src_self.rc_channel = 0;
+
+ src_peer.rc_family = AF_BLUETOOTH;
+
+ if (my_str2ba (addr, &src_peer.rc_bdaddr)) {
+ DEBUG_CRITICAL3("open_rfcomm can't parse %s %d",addr,1);
+ return -1;
+ }
+
+ src_peer.rc_channel = 1;
+
+ DEBUG_CRITICAL3("open_rfcomm connecting to %s %d",addr,src_peer.rc_channel);
+
+
+ fd = socket (AF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
+
+ if (fd < 0)
+ {
+ DEBUG_CRITICAL ("socket(AF_BLUETOOTH,SOCK_STREAM,BTPROTO_RFCOMM)");
+ return -1;
+ }
+
+
+ if (bind (fd, (struct sockaddr *) &src_self, sizeof (src_self)))
+ {
+ close (fd);
+ DEBUG_CRITICAL ("bind");
+ return -1;
+ }
+
+ if (connect (fd, (struct sockaddr *) &src_peer, sizeof (src_peer)))
+ {
+ close (fd);
+ DEBUG_CRITICAL ("connect");
+ return -1;
+ }
+
+ return fd;
+}
+
+
+static status_t check_open(unsigned int reader_index)
+{
+ struct termios current_termios;
+
+ if (serialDevice[reader_index].fd!=-1) return STATUS_SUCCESS;
+
+
+ serialDevice[reader_index].fd = open_rfcomm(serialDevice[reader_index].device);
+
+ if (-1 == serialDevice[reader_index].fd)
+ {
+ DEBUG_CRITICAL3("open %s: %s", serialDevice[reader_index].device, "failed");
+ return STATUS_COMM_ERROR;
+ }
+
+ serialDevice[reader_index].buffer_offset = 0;
+ serialDevice[reader_index].buffer_offset_last = 0;
+
+ {
+
+ unsigned char tx_buffer[]={0xa9,0x73,0x73};
+ if (write(serialDevice[reader_index].fd, tx_buffer,sizeof(tx_buffer)) != sizeof(tx_buffer)) {
+ (void)close(serialDevice[reader_index].fd);
+ serialDevice[reader_index].fd = -1;
+ DEBUG_INFO2("send init error: %s", strerror(errno));
+ return STATUS_COMM_ERROR;
+ }
+ sleep(1);
+
+ }
+
+ {
+ unsigned char tx_buffer[] = { 0x02,0x00 };
+ unsigned char rx_buffer[50];
+ unsigned int rx_length = sizeof(rx_buffer);
+
+ if (IFD_SUCCESS != CmdEscape(reader_index, tx_buffer, sizeof(tx_buffer),
+ rx_buffer, &rx_length, 0))
+ {
+ DEBUG_CRITICAL("thing 1 failed.");
+ (void)CloseHidSerial(reader_index);
+ return STATUS_COMM_ERROR;
+ }
+ }
+
+
+ {
+ unsigned char tx_buffer[] = { 0x0c,0x26 };
+ unsigned char rx_buffer[50];
+ unsigned int rx_length = sizeof(rx_buffer);
+
+ if (IFD_SUCCESS != CmdEscape(reader_index, tx_buffer, sizeof(tx_buffer),
+ rx_buffer, &rx_length, 0))
+ {
+ DEBUG_CRITICAL("thing 2 failed.");
+ (void)CloseHidSerial(reader_index);
+ return STATUS_COMM_ERROR;
+ }
+ }
+
+
+ return STATUS_SUCCESS;
+}
+
+
+/* unexported functions */
+static int ReadChunk(unsigned int reader_index, unsigned char *buffer,
+ int buffer_length, int min_length);
+
+static int get_bytes(unsigned int reader_index, /*@out@*/ unsigned char *buffer,
+ int length);
+
+
+/*****************************************************************************
+ *
+ * WriteHidSerial: Send bytes to the card reader
+ *
+ *****************************************************************************/
+status_t WriteHidSerial(unsigned int reader_index, unsigned int length,
+ unsigned char *buffer)
+{
+ status_t ret;
+ unsigned int i;
+ unsigned char lrc;
+ unsigned char low_level_buffer[HID_MAXBUF];
+
+ char debug_header[] = "-> 123456 ";
+
+ (void)snprintf(debug_header, sizeof(debug_header), "-> %06X ",
+ reader_index);
+
+ if (length > HID_MAXBUF-3)
+ {
+ DEBUG_CRITICAL3("command too long: %d for max %d",
+ length, HID_MAXBUF-3);
+ return STATUS_UNSUCCESSFUL;
+ }
+
+ ret=check_open(reader_index);
+ if (ret!=STATUS_SUCCESS) {
+ if ((length==10) &&
+ (buffer[0]==0x65) &&
+ (buffer[1]==0x00) &&
+ (buffer[2]==0x00) &&
+ (buffer[3]==0x00) &&
+ (buffer[4]==0x00) &&
+ (buffer[5]==0x00) &&
+ (buffer[7]==0x00) &&
+ (buffer[8]==0x00) &&
+ (buffer[9]==0x00)) {
+
+ serialDevice[reader_index].fake_empty=1;
+ serialDevice[reader_index].fake_empty_seq=buffer[6];
+
+ return STATUS_SUCCESS;
+ }
+
+ return ret;
+ }
+
+
+ /* header */
+ low_level_buffer[0] = 0xa5;
+
+ /* CCID command */
+ memcpy(low_level_buffer+1, buffer, length);
+
+ /* checksum */
+ lrc = 0;
+ for(i=1; i<length+1; i++)
+ lrc ^= low_level_buffer[i];
+ low_level_buffer[length+1] = lrc;
+
+ DEBUG_XXD(debug_header, low_level_buffer, 1);
+ DEBUG_XXD(debug_header, low_level_buffer+1, length);
+ DEBUG_XXD(debug_header, low_level_buffer+length+1, 1);
+
+ if (write(serialDevice[reader_index].fd, low_level_buffer,
+ length+2) != length+2)
+ {
+ DEBUG_CRITICAL2("write error: %s", strerror(errno));
+ close(serialDevice[reader_index].fd);
+ serialDevice[reader_index].fd=-1;
+ return STATUS_COMM_ERROR;
+ }
+
+ return STATUS_SUCCESS;
+} /* WriteHidSerial */
+
+
+/*****************************************************************************
+ *
+ * ReadHidSerial: Receive bytes from the card reader
+ *
+ *****************************************************************************/
+status_t ReadHidSerial(unsigned int reader_index,
+ unsigned int *length, unsigned char *buffer)
+{
+ unsigned char low_level_buffer[0x10];
+ unsigned low_level_len;
+ unsigned char lrc;
+ int rv;
+ unsigned to_read;
+ unsigned i;
+ char debug_header[] = "<- 123456 ";
+ status_t ret;
+
+
+ if (serialDevice[reader_index].fake_empty) {
+ *length=10;
+ buffer[0]=0x81;
+ buffer[1]=0x00;
+ buffer[2]=0x00;
+ buffer[3]=0x00;
+ buffer[4]=0x00;
+ buffer[5]=0x00;
+ buffer[6]= serialDevice[reader_index].fake_empty_seq;
+ buffer[7]=0x02;
+ buffer[8]=0x00;
+ buffer[9]=0x00;
+ serialDevice[reader_index].fake_empty=0;
+
+ return STATUS_SUCCESS;
+
+ }
+
+ ret=check_open(reader_index);
+ if (ret!=STATUS_SUCCESS)
+ return ret;
+
+
+do {
+ DEBUG_COMM("start");
+ if ((rv = get_bytes(reader_index, &low_level_buffer[0], 1)) != STATUS_SUCCESS)
+ return rv;
+
+ DEBUG_COMM2("Got first byte 0x%02x\n",low_level_buffer[0]);
+
+ switch (low_level_buffer[0]) {
+ case 0x55:
+ if ((rv = get_bytes(reader_index, &low_level_buffer[1], 2)) != STATUS_SUCCESS)
+ return rv;
+ DEBUG_XXD(debug_header, low_level_buffer, 3);
+ return STATUS_UNSUCCESSFUL;
+ case 0xa9:
+ if ((rv = get_bytes(reader_index, &low_level_buffer[1], 2)) != STATUS_SUCCESS)
+ return rv;
+ DEBUG_XXD(debug_header, low_level_buffer, 3);
+ break;
+ case 0xa3:
+ if ((rv = get_bytes(reader_index, &low_level_buffer[1], 3)) != STATUS_SUCCESS)
+ return rv;
+ DEBUG_XXD(debug_header, low_level_buffer, 4);
+ break;
+ case 0xa5: /*ccid reply */
+
+ if ((rv = get_bytes(reader_index, buffer, 10)) != STATUS_SUCCESS)
+ return rv;
+
+ to_read = dw2i(buffer, 1);
+
+ if ((rv = get_bytes(reader_index, &buffer[10], to_read)) != STATUS_SUCCESS)
+ return rv;
+
+ to_read+=10;
+
+ if ((rv = get_bytes(reader_index, &low_level_buffer[1], 1)) != STATUS_SUCCESS)
+ return rv;
+
+ DEBUG_XXD(debug_header, &low_level_buffer[0],1);
+ DEBUG_XXD(debug_header, buffer,to_read);
+ DEBUG_XXD(debug_header, &low_level_buffer[1],1);
+
+ lrc=0;
+ for (i=0;i<to_read;++i)
+ lrc^=buffer[i];
+
+
+ if (lrc!=low_level_buffer[1]) {
+ DEBUG_CRITICAL3("Wrong LRC: 0x%02X != 0x%02X",lrc,low_level_buffer[1]);
+ return STATUS_COMM_ERROR;
+ }
+
+ *length =to_read;
+
+ return STATUS_SUCCESS;
+}
+} while (1);
+} /* ReadHidSerial */
+
+
+/*****************************************************************************
+ *
+ * get_bytes: get n bytes
+ *
+ *****************************************************************************/
+int get_bytes(unsigned int reader_index, unsigned char *buffer, int length)
+{
+ int offset = serialDevice[reader_index].buffer_offset;
+ int offset_last = serialDevice[reader_index].buffer_offset_last;
+
+ DEBUG_COMM3("available: %d, needed: %d", offset_last-offset,
+ length);
+ /* enough data are available */
+ if (offset + length <= offset_last)
+ {
+ DEBUG_COMM("data available");
+ memcpy(buffer, serialDevice[reader_index].buffer + offset, length);
+ serialDevice[reader_index].buffer_offset += length;
+ }
+ else
+ {
+ int present, rv;
+
+ /* copy available data */
+ present = offset_last - offset;
+
+ if (present > 0)
+ {
+ DEBUG_COMM2("some data available: %d", present);
+ memcpy(buffer, serialDevice[reader_index].buffer + offset,
+ present);
+ }
+
+ /* get fresh data */
+ DEBUG_COMM2("get more data: %d", length - present);
+ rv = ReadChunk(reader_index, serialDevice[reader_index].buffer,
+ sizeof(serialDevice[reader_index].buffer), length - present);
+ if (rv < 0)
+ return STATUS_COMM_ERROR;
+
+ /* fill the buffer */
+ memcpy(buffer + present, serialDevice[reader_index].buffer,
+ length - present);
+ serialDevice[reader_index].buffer_offset = length - present;
+ serialDevice[reader_index].buffer_offset_last = rv;
+ DEBUG_COMM3("offset: %d, last_offset: %d",
+ serialDevice[reader_index].buffer_offset,
+ serialDevice[reader_index].buffer_offset_last);
+ }
+
+ return STATUS_SUCCESS;
+} /* get_bytes */
+
+
+/*****************************************************************************
+ *
+ * ReadChunk: read a minimum number of bytes
+ *
+ *****************************************************************************/
+static int ReadChunk(unsigned int reader_index, unsigned char *buffer,
+ int buffer_length, int min_length)
+{
+ int fd = serialDevice[reader_index].fd;
+# ifndef S_SPLINT_S
+ fd_set fdset;
+# endif
+ struct timeval t;
+ int i, rv = 0;
+ int already_read;
+ char debug_header[] = "<- 123456 ";
+
+ (void)snprintf(debug_header, sizeof(debug_header), "<- %06X ",
+ reader_index);
+
+ already_read = 0;
+ while (already_read < min_length)
+ {
+ /* use select() to, eventually, timeout */
+ FD_ZERO(&fdset);
+ FD_SET(fd, &fdset);
+ t.tv_sec = serialDevice[reader_index].ccid.readTimeout / 1000;
+ t.tv_usec = (serialDevice[reader_index].ccid.readTimeout - t.tv_sec*1000)*1000;
+
+ i = select(fd+1, &fdset, NULL, NULL, &t);
+ if (i == -1)
+ {
+ DEBUG_CRITICAL2("select: %s", strerror(errno));
+ return -1;
+ }
+ else
+ if (i == 0)
+ {
+ DEBUG_COMM2("Timeout! (%d ms)", serialDevice[reader_index].ccid.readTimeout);
+ return -1;
+ }
+
+ rv = read(fd, buffer + already_read, buffer_length - already_read);
+ if (rv < 0)
+ {
+ DEBUG_COMM2("read error: %s", strerror(errno));
+ return -1;
+ }
+ if (!rv) {
+ close(fd);
+ serialDevice[reader_index].fd=-1;
+ return -1;
+ }
+
+
+ DEBUG_XXD(debug_header, buffer + already_read, rv);
+
+ already_read += rv;
+ DEBUG_COMM3("read: %d, to read: %d", already_read,
+ min_length);
+ }
+
+ return already_read;
+} /* ReadChunk */
+
+
+/*****************************************************************************
+ *
+ * OpenHidSerial: open the port
+ *
+ *****************************************************************************/
+status_t OpenHidSerial(unsigned int reader_index, int channel)
+{
+ return STATUS_UNSUCCESSFUL;
+} /* OpenHidSerial */
+
+/*****************************************************************************
+ *
+ * set_ccid_descriptor: init ccid descriptor
+ * depending on reader type specified in device.
+ *
+ * return: STATUS_UNSUCCESSFUL,
+ * STATUS_SUCCESS,
+ * -1 (Reader already used)
+ *
+ *****************************************************************************/
+static status_t set_ccid_descriptor(unsigned int reader_index,
+ const char *reader_name, const char *dev_name)
+{
+ int readerID;
+ int i;
+
+ readerID = HID_OMNIKEY_2061;
+
+ /* check if the same channel is not already used to manage multi-slots readers*/
+ for (i = 0; i < CCID_DRIVER_MAX_READERS; i++)
+ {
+ if (serialDevice[i].device
+ && strcmp(serialDevice[i].device, dev_name) == 0)
+ {
+ DEBUG_COMM2("%s already used. Multi-slot reader?", dev_name);
+ return STATUS_UNSUCCESSFUL;
+ }
+ }
+
+ /* Common to all readers */
+ serialDevice[reader_index].ccid.real_bSeq = 0x77;
+ serialDevice[reader_index].ccid.pbSeq = &serialDevice[reader_index].ccid.real_bSeq;
+ serialDevice[reader_index].real_nb_opened_slots = 1;
+ serialDevice[reader_index].nb_opened_slots = &serialDevice[reader_index].real_nb_opened_slots;
+
+ serialDevice[reader_index].buffer_offset = 0;
+ serialDevice[reader_index].buffer_offset_last = 0;
+
+ serialDevice[reader_index].ccid.readerID = readerID;
+
+ serialDevice[reader_index].ccid.bCurrentSlotIndex = 0;
+
+ serialDevice[reader_index].ccid.dwMaxCCIDMessageLength = 0x10f;
+ serialDevice[reader_index].ccid.dwMaxIFSD = 0xfe;
+ serialDevice[reader_index].ccid.dwDefaultClock = 0x12c0;
+ serialDevice[reader_index].ccid.bPINSupport = 0x0;
+ serialDevice[reader_index].ccid.dwMaxDataRate = 0x64ce7;
+ serialDevice[reader_index].ccid.bMaxSlotIndex = 0;
+ serialDevice[reader_index].ccid.arrayOfSupportedDataRates = OMNIKey2061Rates;
+
+
+ serialDevice[reader_index].ccid.dwFeatures = 0x000207B8;
+
+
+ serialDevice[reader_index].ccid.readTimeout = DEFAULT_COM_READ_TIMEOUT;
+ serialDevice[reader_index].ccid.dwSlotStatus = IFD_ICC_PRESENT;
+ serialDevice[reader_index].ccid.bVoltageSupport = 0x07; /* 1.8V, 3V and 5V */
+
+ serialDevice[reader_index].ccid.gemalto_firmware_features = NULL;
+
+ return STATUS_SUCCESS;
+} /* set_ccid_descriptor */
+
+
+/*****************************************************************************
+ *
+ * OpenHidSerialByName: open the port
+ *
+ *****************************************************************************/
+status_t OpenHidSerialByName(unsigned int reader_index, char *dev_name)
+{
+ unsigned int reader = reader_index;
+ /* 255 is MAX_DEVICENAME in pcscd.h */
+ char reader_name[255] = "HID 2061";
+ char *p;
+ status_t ret;
+
+ DEBUG_COMM3("Reader index: %X, Device: %s", reader_index, dev_name);
+
+ ret = set_ccid_descriptor(reader_index, reader_name, dev_name);
+ if (STATUS_UNSUCCESSFUL == ret)
+ return STATUS_UNSUCCESSFUL;
+
+ /* set channel used */
+ serialDevice[reader].device = strdup(dev_name);
+
+ serialDevice[reader].fd = -1;
+
+ serialDevice[reader_index].ccid.sIFD_serial_number = NULL;
+ serialDevice[reader_index].ccid.sIFD_iManufacturer = NULL;
+ serialDevice[reader_index].ccid.IFD_bcdDevice = 0;
+
+ return STATUS_SUCCESS;
+} /* OpenHidSerialByName */
+
+
+/*****************************************************************************
+ *
+ * CloseHidSerial: close the port
+ *
+ *****************************************************************************/
+status_t CloseHidSerial(unsigned int reader_index)
+{
+ unsigned int reader = reader_index;
+
+ /* device not opened */
+ if (NULL == serialDevice[reader_index].device)
+ return STATUS_UNSUCCESSFUL;
+
+ DEBUG_COMM2("Closing serial device: %s", serialDevice[reader_index].device);
+
+ /* Decrement number of opened slot */
+ (*serialDevice[reader_index].nb_opened_slots)--;
+
+ /* release the allocated ressources for the last slot only */
+ if (0 == *serialDevice[reader_index].nb_opened_slots)
+ {
+ DEBUG_COMM("Last slot closed. Release resources");
+
+ if (serialDevice[reader].fd!=-1) {
+ (void)close(serialDevice[reader].fd);
+ serialDevice[reader].fd = -1;
+ }
+
+ free(serialDevice[reader].device);
+ serialDevice[reader].device = NULL;
+ }
+
+ return STATUS_SUCCESS;
+} /* CloseHidSerial */
+
+
+/*****************************************************************************
+ *
+ * get_ccid_descriptor
+ *
+ ****************************************************************************/
+_ccid_descriptor *get_ccid_descriptor(unsigned int reader_index)
+{
+ return &serialDevice[reader_index].ccid;
+} /* get_ccid_descriptor */
+
+
diff --git a/src/ccid_hid_serial.h b/src/ccid_hid_serial.h
new file mode 100644
index 0000000..60e1587
--- /dev/null
+++ b/src/ccid_hid_serial.h
@@ -0,0 +1,35 @@
+/*
+ ccid_hid_serial.h: Serial access routines
+ Copyright (C) 2003-2008 Ludovic Rousseau
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef __CCID_HID_SERIAL_H__
+#define __CCID_HID_SERIAL_H__
+
+status_t OpenHidSerial(unsigned int reader_index, int channel);
+
+status_t OpenHidSerialByName(unsigned int reader_index, char *dev_name);
+
+status_t WriteHidSerial(unsigned int reader_index, unsigned int length,
+ unsigned char *Buffer);
+
+status_t ReadHidSerial(unsigned int reader_index, unsigned int *length,
+ unsigned char *Buffer);
+
+status_t CloseHidSerial(unsigned int reader_index);
+
+#endif
diff --git a/src/ccid_serial.c b/src/ccid_serial.c
deleted file mode 100644
index 32f4027..0000000
--- a/src/ccid_serial.c
+++ /dev/null
@@ -1,916 +0,0 @@
-/*
- * ccid_serial.c: communicate with a GemPC Twin smart card reader
- * Copyright (C) 2001-2010 Ludovic Rousseau <ludovic.rousseau at free.fr>
- *
- * Thanks to Niki W. Waibel <niki.waibel at gmx.net> for a prototype version
- *
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <termios.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <ifdhandler.h>
-
-#include <config.h>
-#include "defs.h"
-#include "ccid_ifdhandler.h"
-#include "debug.h"
-#include "ccid.h"
-#include "utils.h"
-#include "commands.h"
-#include "parser.h"
-#include "strlcpycat.h"
-
-#define SYNC 0x03
-#define CTRL_ACK 0x06
-#define CTRL_NAK 0x15
-#define RDR_to_PC_NotifySlotChange 0x50
-#define CARD_ABSENT 0x02
-#define CARD_PRESENT 0x03
-
-/*
- * normal command:
- * 1 : SYNC
- * 1 : CTRL
- * 10 +data length : CCID command
- * 1 : LRC
- *
- * SYNC : 0x03
- * CTRL : ACK (0x06) or NAK (0x15)
- * CCID command : see USB CCID specs
- * LRC : xor of all the previous byes
- *
- * Error message:
- * 1 : SYNC (0x03)
- * 1 : CTRL (NAK: 0x15)
- * 1 : LRC (0x16)
- *
- * Card insertion/withdrawal
- * 1 : RDR_to_PC_NotifySlotChange (0x50)
- * 1 : bmSlotIccState
- * 0x02 if card absent
- * 0x03 is card present
- *
- * Time request
- * T=1 : normal CCID command
- * T=0 : 1 byte (value between 0x80 and 0xFF)
- *
- */
-
-/*
- * You may get read timeout after a card movement.
- * This is because you will get the echo of the CCID command
- * but not the result of the command.
- *
- * This is not an applicative issue since the card is either removed (and
- * powered off) or just inserted (and not yet powered on).
- */
-
-/* 271 = max size for short APDU
- * 2 bytes for header
- * 1 byte checksum
- * doubled for echo
- */
-#define GEMPCTWIN_MAXBUF (271 +2 +1) * 2
-
-typedef struct
-{
- /*
- * File handle on the serial port
- */
- int fd;
-
- /*
- * device used ("/dev/ttyS?" under Linux)
- */
- /*@null@*/ char *device;
-
- /*
- * Number of slots using the same device
- */
- int real_nb_opened_slots;
- int *nb_opened_slots;
-
- /*
- * does the reader echoes the serial communication bytes?
- */
- int echo;
-
- /*
- * serial communication buffer
- */
- unsigned char buffer[GEMPCTWIN_MAXBUF];
-
- /*
- * next available byte
- */
- int buffer_offset;
-
- /*
- * number of available bytes
- */
- int buffer_offset_last;
-
- /*
- * CCID infos common to USB and serial
- */
- _ccid_descriptor ccid;
-
-} _serialDevice;
-
-/* The _serialDevice structure must be defined before including ccid_serial.h */
-#include "ccid_serial.h"
-
-/* data rates supported by the GemPC Twin (serial and PCMCIA) */
-unsigned int SerialTwinDataRates[] = { ISO_DATA_RATES, 0 };
-
-/* data rates supported by the GemPC PinPad, GemCore Pos Pro & SIM Pro */
-unsigned int SerialExtendedDataRates[] = { ISO_DATA_RATES, 500000, 0 };
-
-/* data rates supported by the secondary slots on the GemCore Pos Pro & SIM Pro */
-unsigned int SerialCustomDataRates[] = { GEMPLUS_CUSTOM_DATA_RATES, 0 };
-
-/* data rates supported by the GemCore SIM Pro 2 */
-unsigned int SIMPro2DataRates[] = { SIMPRO2_ISO_DATA_RATES, 0 };
-
-/* no need to initialize to 0 since it is static */
-static _serialDevice serialDevice[CCID_DRIVER_MAX_READERS];
-
-/* unexported functions */
-static int ReadChunk(unsigned int reader_index, unsigned char *buffer,
- int buffer_length, int min_length);
-
-static int get_bytes(unsigned int reader_index, /*@out@*/ unsigned char *buffer,
- int length);
-
-
-/*****************************************************************************
- *
- * WriteSerial: Send bytes to the card reader
- *
- *****************************************************************************/
-status_t WriteSerial(unsigned int reader_index, unsigned int length,
- unsigned char *buffer)
-{
- unsigned int i;
- unsigned char lrc;
- unsigned char low_level_buffer[GEMPCTWIN_MAXBUF];
-
- char debug_header[] = "-> 123456 ";
-
- (void)snprintf(debug_header, sizeof(debug_header), "-> %06X ",
- reader_index);
-
- if (length > GEMPCTWIN_MAXBUF-3)
- {
- DEBUG_CRITICAL3("command too long: %d for max %d",
- length, GEMPCTWIN_MAXBUF-3);
- return STATUS_UNSUCCESSFUL;
- }
-
- /* header */
- low_level_buffer[0] = 0x03; /* SYNC */
- low_level_buffer[1] = 0x06; /* ACK */
-
- /* CCID command */
- memcpy(low_level_buffer+2, buffer, length);
-
- /* checksum */
- lrc = 0;
- for(i=0; i<length+2; i++)
- lrc ^= low_level_buffer[i];
- low_level_buffer[length+2] = lrc;
-
- DEBUG_XXD(debug_header, low_level_buffer, length+3);
-
- if (write(serialDevice[reader_index].fd, low_level_buffer,
- length+3) != length+3)
- {
- DEBUG_CRITICAL2("write error: %s", strerror(errno));
- return STATUS_UNSUCCESSFUL;
- }
-
- return STATUS_SUCCESS;
-} /* WriteSerial */
-
-
-/*****************************************************************************
- *
- * ReadSerial: Receive bytes from the card reader
- *
- *****************************************************************************/
-status_t ReadSerial(unsigned int reader_index,
- unsigned int *length, unsigned char *buffer)
-{
- unsigned char c;
- int rv;
- int echo;
- int to_read;
- int i;
-
- /* we get the echo first */
- echo = serialDevice[reader_index].echo;
-
-start:
- DEBUG_COMM("start");
- if ((rv = get_bytes(reader_index, &c, 1)) != STATUS_SUCCESS)
- return rv;
-
- if (c == RDR_to_PC_NotifySlotChange)
- goto slot_change;
-
- if (c == SYNC)
- goto sync;
-
- if (c >= 0x80)
- {
- DEBUG_COMM2("time request: 0x%02X", c);
- goto start;
- }
-
- DEBUG_CRITICAL2("Got 0x%02X", c);
- return STATUS_COMM_ERROR;
-
-slot_change:
- DEBUG_COMM("slot change");
- if ((rv = get_bytes(reader_index, &c, 1)) != STATUS_SUCCESS)
- return rv;
-
- if (c == CARD_ABSENT)
- {
- DEBUG_COMM("Card removed");
- }
- else
- if (c == CARD_PRESENT)
- {
- DEBUG_COMM("Card inserted");
- }
- else
- {
- DEBUG_COMM2("Unknown card movement: %d", c);
- }
- goto start;
-
-sync:
- DEBUG_COMM("sync");
- if ((rv = get_bytes(reader_index, &c, 1)) != STATUS_SUCCESS)
- return rv;
-
- if (c == CTRL_ACK)
- goto ack;
-
- if (c == CTRL_NAK)
- goto nak;
-
- DEBUG_CRITICAL2("Got 0x%02X instead of ACK/NAK", c);
- return STATUS_COMM_ERROR;
-
-nak:
- DEBUG_COMM("nak");
- if ((rv = get_bytes(reader_index, &c, 1)) != STATUS_SUCCESS)
- return rv;
-
- if (c != (SYNC ^ CTRL_NAK))
- {
- DEBUG_CRITICAL2("Wrong LRC: 0x%02X", c);
- return STATUS_COMM_ERROR;
- }
- else
- {
- DEBUG_COMM("NAK requested");
- return STATUS_COMM_NAK;
- }
-
-ack:
- DEBUG_COMM("ack");
- /* normal CCID frame */
- if ((rv = get_bytes(reader_index, buffer, 5)) != STATUS_SUCCESS)
- return rv;
-
- /* total frame size */
- to_read = 10+dw2i(buffer, 1);
-
- if ((to_read < 10) || (to_read > (int)*length))
- {
- DEBUG_CRITICAL2("Wrong value for frame size: %d", to_read);
- return STATUS_COMM_ERROR;
- }
-
- DEBUG_COMM2("frame size: %d", to_read);
- if ((rv = get_bytes(reader_index, buffer+5, to_read-5)) != STATUS_SUCCESS)
- return rv;
-
- DEBUG_XXD("frame: ", buffer, to_read);
-
- /* lrc */
- DEBUG_COMM("lrc");
- if ((rv = get_bytes(reader_index, &c, 1)) != STATUS_SUCCESS)
- return rv;
-
- DEBUG_COMM2("lrc: 0x%02X", c);
- for (i=0; i<to_read; i++)
- c ^= buffer[i];
-
- if (c != (SYNC ^ CTRL_ACK))
- DEBUG_CRITICAL2("Wrong LRC: 0x%02X", c);
-
- if (echo)
- {
- echo = FALSE;
- goto start;
- }
-
- /* length of data read */
- *length = to_read;
-
- return STATUS_SUCCESS;
-} /* ReadSerial */
-
-
-/*****************************************************************************
- *
- * get_bytes: get n bytes
- *
- *****************************************************************************/
-int get_bytes(unsigned int reader_index, unsigned char *buffer, int length)
-{
- int offset = serialDevice[reader_index].buffer_offset;
- int offset_last = serialDevice[reader_index].buffer_offset_last;
-
- DEBUG_COMM3("available: %d, needed: %d", offset_last-offset,
- length);
- /* enough data are available */
- if (offset + length <= offset_last)
- {
- DEBUG_COMM("data available");
- memcpy(buffer, serialDevice[reader_index].buffer + offset, length);
- serialDevice[reader_index].buffer_offset += length;
- }
- else
- {
- int present, rv;
-
- /* copy available data */
- present = offset_last - offset;
-
- if (present > 0)
- {
- DEBUG_COMM2("some data available: %d", present);
- memcpy(buffer, serialDevice[reader_index].buffer + offset,
- present);
- }
-
- /* get fresh data */
- DEBUG_COMM2("get more data: %d", length - present);
- rv = ReadChunk(reader_index, serialDevice[reader_index].buffer,
- sizeof(serialDevice[reader_index].buffer), length - present);
- if (rv < 0)
- return STATUS_COMM_ERROR;
-
- /* fill the buffer */
- memcpy(buffer + present, serialDevice[reader_index].buffer,
- length - present);
- serialDevice[reader_index].buffer_offset = length - present;
- serialDevice[reader_index].buffer_offset_last = rv;
- DEBUG_COMM3("offset: %d, last_offset: %d",
- serialDevice[reader_index].buffer_offset,
- serialDevice[reader_index].buffer_offset_last);
- }
-
- return STATUS_SUCCESS;
-} /* get_bytes */
-
-
-/*****************************************************************************
- *
- * ReadChunk: read a minimum number of bytes
- *
- *****************************************************************************/
-static int ReadChunk(unsigned int reader_index, unsigned char *buffer,
- int buffer_length, int min_length)
-{
- int fd = serialDevice[reader_index].fd;
-# ifndef S_SPLINT_S
- fd_set fdset;
-# endif
- struct timeval t;
- int i, rv = 0;
- int already_read;
- char debug_header[] = "<- 123456 ";
-
- (void)snprintf(debug_header, sizeof(debug_header), "<- %06X ",
- reader_index);
-
- already_read = 0;
- while (already_read < min_length)
- {
- /* use select() to, eventually, timeout */
- FD_ZERO(&fdset);
- FD_SET(fd, &fdset);
- t.tv_sec = serialDevice[reader_index].ccid.readTimeout / 1000;
- t.tv_usec = (serialDevice[reader_index].ccid.readTimeout - t.tv_sec*1000)*1000;
-
- i = select(fd+1, &fdset, NULL, NULL, &t);
- if (i == -1)
- {
- DEBUG_CRITICAL2("select: %s", strerror(errno));
- return -1;
- }
- else
- if (i == 0)
- {
- DEBUG_COMM2("Timeout! (%d ms)", serialDevice[reader_index].ccid.readTimeout);
- return -1;
- }
-
- rv = read(fd, buffer + already_read, buffer_length - already_read);
- if (rv < 0)
- {
- DEBUG_COMM2("read error: %s", strerror(errno));
- return -1;
- }
-
- DEBUG_XXD(debug_header, buffer + already_read, rv);
-
- already_read += rv;
- DEBUG_COMM3("read: %d, to read: %d", already_read,
- min_length);
- }
-
- return already_read;
-} /* ReadChunk */
-
-
-/*****************************************************************************
- *
- * OpenSerial: open the port
- *
- *****************************************************************************/
-status_t OpenSerial(unsigned int reader_index, int channel)
-{
- char dev_name[FILENAME_MAX];
-
- DEBUG_COMM3("Reader index: %X, Channel: %d", reader_index, channel);
-
- /*
- * Conversion of old-style ifd-hanler 1.0 CHANNELID
- */
- if (channel == 0x0103F8)
- channel = 1;
- else
- if (channel == 0x0102F8)
- channel = 2;
- else
- if (channel == 0x0103E8)
- channel = 3;
- else
- if (channel == 0x0102E8)
- channel = 4;
-
- if (channel < 0)
- {
- DEBUG_CRITICAL2("wrong port number: %d", channel);
- return STATUS_UNSUCCESSFUL;
- }
-
- (void)snprintf(dev_name, sizeof(dev_name), "/dev/pcsc/%d", channel);
-
- return OpenSerialByName(reader_index, dev_name);
-} /* OpenSerial */
-
-/*****************************************************************************
- *
- * set_ccid_descriptor: init ccid descriptor
- * depending on reader type specified in device.
- *
- * return: STATUS_UNSUCCESSFUL,
- * STATUS_SUCCESS,
- * -1 (Reader already used)
- *
- *****************************************************************************/
-static status_t set_ccid_descriptor(unsigned int reader_index,
- const char *reader_name, const char *dev_name)
-{
- int readerID;
- int i;
- int already_used = FALSE;
- static int previous_reader_index = -1;
-
- readerID = GEMPCTWIN;
- if (0 == strcasecmp(reader_name,"GemCorePOSPro"))
- readerID = GEMCOREPOSPRO;
- else if (0 == strcasecmp(reader_name,"GemCoreSIMPro"))
- readerID = GEMCORESIMPRO;
- else if (0 == strcasecmp(reader_name,"GemCoreSIMPro2"))
- readerID = GEMCORESIMPRO2;
- else if (0 == strcasecmp(reader_name,"GemPCPinPad"))
- readerID = GEMPCPINPAD;
-
- /* check if the same channel is not already used to manage multi-slots readers*/
- for (i = 0; i < CCID_DRIVER_MAX_READERS; i++)
- {
- if (serialDevice[i].device
- && strcmp(serialDevice[i].device, dev_name) == 0)
- {
- already_used = TRUE;
-
- DEBUG_COMM2("%s already used. Multi-slot reader?", dev_name);
- break;
- }
- }
-
- /* this reader is already managed by us */
- if (already_used)
- {
- if ((previous_reader_index != -1)
- && serialDevice[previous_reader_index].device
- && (strcmp(serialDevice[previous_reader_index].device, dev_name) == 0)
- && serialDevice[previous_reader_index].ccid.bCurrentSlotIndex < serialDevice[previous_reader_index].ccid.bMaxSlotIndex)
- {
- /* we reuse the same device and the reader is multi-slot */
- serialDevice[reader_index] = serialDevice[previous_reader_index];
-
- *serialDevice[reader_index].nb_opened_slots += 1;
- serialDevice[reader_index].ccid.bCurrentSlotIndex++;
- serialDevice[reader_index].ccid.dwSlotStatus = IFD_ICC_PRESENT;
- DEBUG_INFO2("Opening slot: %d",
- serialDevice[reader_index].ccid.bCurrentSlotIndex);
- switch (readerID)
- {
- case GEMCOREPOSPRO:
- case GEMCORESIMPRO:
- {
- /* Allocate a memory buffer that will be
- * released in CloseUSB() */
- void *ptr = malloc(sizeof SerialCustomDataRates);
- if (ptr)
- {
- memcpy(ptr, SerialCustomDataRates,
- sizeof SerialCustomDataRates);
- }
-
- serialDevice[reader_index].ccid.arrayOfSupportedDataRates = ptr;
- }
- serialDevice[reader_index].ccid.dwMaxDataRate = 125000;
- break;
-
- /* GemPC Twin or GemPC Card */
- default:
- serialDevice[reader_index].ccid.arrayOfSupportedDataRates = SerialTwinDataRates;
- serialDevice[reader_index].ccid.dwMaxDataRate = 344086;
- break;
- }
- goto end;
- }
- else
- {
- DEBUG_CRITICAL2("Trying to open too many slots on %s", dev_name);
- return STATUS_UNSUCCESSFUL;
- }
-
- }
-
- /* Common to all readers */
- serialDevice[reader_index].ccid.real_bSeq = 0;
- serialDevice[reader_index].ccid.pbSeq = &serialDevice[reader_index].ccid.real_bSeq;
- serialDevice[reader_index].real_nb_opened_slots = 1;
- serialDevice[reader_index].nb_opened_slots = &serialDevice[reader_index].real_nb_opened_slots;
- serialDevice[reader_index].ccid.bCurrentSlotIndex = 0;
-
- serialDevice[reader_index].ccid.dwMaxCCIDMessageLength = 271;
- serialDevice[reader_index].ccid.dwMaxIFSD = 254;
- serialDevice[reader_index].ccid.dwFeatures = 0x00010230;
- serialDevice[reader_index].ccid.dwDefaultClock = 4000;
-
- serialDevice[reader_index].buffer_offset = 0;
- serialDevice[reader_index].buffer_offset_last = 0;
-
- serialDevice[reader_index].ccid.readerID = readerID;
- serialDevice[reader_index].ccid.bPINSupport = 0x0;
- serialDevice[reader_index].ccid.dwMaxDataRate = 344086;
- serialDevice[reader_index].ccid.bMaxSlotIndex = 0;
- serialDevice[reader_index].ccid.arrayOfSupportedDataRates = SerialTwinDataRates;
- serialDevice[reader_index].ccid.readTimeout = DEFAULT_COM_READ_TIMEOUT;
- serialDevice[reader_index].ccid.dwSlotStatus = IFD_ICC_PRESENT;
- serialDevice[reader_index].ccid.bVoltageSupport = 0x07; /* 1.8V, 3V and 5V */
- serialDevice[reader_index].ccid.gemalto_firmware_features = NULL;
- serialDevice[reader_index].echo = TRUE;
-
- /* change some values depending on the reader */
- switch (readerID)
- {
- case GEMCOREPOSPRO:
- serialDevice[reader_index].ccid.bMaxSlotIndex = 4; /* 5 slots */
- serialDevice[reader_index].ccid.arrayOfSupportedDataRates = SerialExtendedDataRates;
- serialDevice[reader_index].echo = FALSE;
- serialDevice[reader_index].ccid.dwMaxDataRate = 500000;
- break;
-
- case GEMCORESIMPRO:
- serialDevice[reader_index].ccid.bMaxSlotIndex = 1; /* 2 slots */
- serialDevice[reader_index].ccid.arrayOfSupportedDataRates = SerialExtendedDataRates;
- serialDevice[reader_index].echo = FALSE;
- serialDevice[reader_index].ccid.dwMaxDataRate = 500000;
- break;
-
- case GEMCORESIMPRO2:
- serialDevice[reader_index].ccid.dwDefaultClock = 4800;
- serialDevice[reader_index].ccid.bMaxSlotIndex = 1; /* 2 slots */
- serialDevice[reader_index].ccid.arrayOfSupportedDataRates = SIMPro2DataRates;
- serialDevice[reader_index].echo = FALSE;
- serialDevice[reader_index].ccid.dwMaxDataRate = 825806;
- break;
-
- case GEMPCPINPAD:
- serialDevice[reader_index].ccid.bPINSupport = 0x03;
- serialDevice[reader_index].ccid.arrayOfSupportedDataRates = SerialExtendedDataRates;
- serialDevice[reader_index].ccid.dwMaxDataRate = 500000;
- break;
- }
-
-end:
- /* memorise the current reader_index so we can detect
- * a new OpenSerialByName on a multi slot reader */
- previous_reader_index = reader_index;
-
- /* we just created a secondary slot on a multi-slot reader */
- if (already_used)
- return STATUS_SECONDARY_SLOT;
-
- return STATUS_SUCCESS;
-} /* set_ccid_descriptor */
-
-
-/*****************************************************************************
- *
- * OpenSerialByName: open the port
- *
- *****************************************************************************/
-status_t OpenSerialByName(unsigned int reader_index, char *dev_name)
-{
- struct termios current_termios;
- unsigned int reader = reader_index;
- /* 255 is MAX_DEVICENAME in pcscd.h */
- char reader_name[255] = "GemPCTwin";
- char *p;
- status_t ret;
-
- DEBUG_COMM3("Reader index: %X, Device: %s", reader_index, dev_name);
-
- /* parse dev_name using the pattern "device:name" */
- p = strchr(dev_name, ':');
- if (p)
- {
- /* copy the second part of the string */
- strlcpy(reader_name, p+1, sizeof(reader_name));
-
- /* replace ':' by '\0' so that dev_name only contains the device name */
- *p = '\0';
- }
-
- ret = set_ccid_descriptor(reader_index, reader_name, dev_name);
- if (STATUS_UNSUCCESSFUL == ret)
- return STATUS_UNSUCCESSFUL;
-
- /* secondary slot so do not physically open the device */
- if (STATUS_SECONDARY_SLOT == ret)
- return STATUS_SUCCESS;
-
- serialDevice[reader].fd = open(dev_name, O_RDWR | O_NOCTTY);
-
- if (-1 == serialDevice[reader].fd)
- {
- DEBUG_CRITICAL3("open %s: %s", dev_name, strerror(errno));
- return STATUS_UNSUCCESSFUL;
- }
-
- /* Set RTS signal to low to prevent the smart card reader
- * from sending its plug and play string. */
- {
- int flags;
-
- if (ioctl(serialDevice[reader].fd, TIOCMGET, &flags) < 0)
- {
- DEBUG_CRITICAL2("Get RS232 signals state failed: %s",
- strerror(errno));
- }
- else
- {
- flags &= ~TIOCM_RTS;
- if (ioctl(serialDevice[reader].fd, TIOCMSET, &flags) < 0)
- {
- DEBUG_CRITICAL2("Set RTS to low failed: %s", strerror(errno));
- }
- else
- {
- DEBUG_COMM("Plug-n-Play inhibition successful");
- }
- }
- }
-
- /* set channel used */
- serialDevice[reader].device = strdup(dev_name);
-
- /* empty in and out serial buffers */
- if (tcflush(serialDevice[reader].fd, TCIOFLUSH))
- DEBUG_INFO2("tcflush() function error: %s", strerror(errno));
-
- /* get config attributes */
- if (tcgetattr(serialDevice[reader].fd, ¤t_termios) == -1)
- {
- DEBUG_INFO2("tcgetattr() function error: %s", strerror(errno));
- (void)close(serialDevice[reader].fd);
- serialDevice[reader].fd = -1;
-
- return STATUS_UNSUCCESSFUL;
- }
-
- /* IGNBRK: ignore BREAK condition on input
- * IGNPAR: ignore framing errors and parity errors. */
- current_termios.c_iflag = IGNBRK | IGNPAR;
- current_termios.c_oflag = 0; /* Raw output modes */
- /* CS8: 8-bits character size
- * CSTOPB: set two stop bits
- * CREAD: enable receiver
- * CLOCAL: ignore modem control lines */
- current_termios.c_cflag = CS8 | CSTOPB | CREAD | CLOCAL;
-
- /* Do not echo characters because if you connect to a host it or your modem
- * will echo characters for you. Don't generate signals. */
- current_termios.c_lflag = 0;
-
- if (0 == strcasecmp(reader_name,"GemCoreSIMPro2"))
- {
- unsigned char pcbuffer[SIZE_GET_SLOT_STATUS];
- unsigned int old_timeout;
- RESPONSECODE r;
-
- /* Unless we resume from a stand-by condition, GemCoreSIMPro2
- * starts at 9600 bauds, so let's first try this speed */
- /* set serial port speed to 9600 bauds */
- (void)cfsetspeed(¤t_termios, B9600);
- DEBUG_INFO1("Set serial port baudrate to 9600 and correct configuration");
- if (tcsetattr(serialDevice[reader_index].fd, TCSANOW, ¤t_termios) == -1)
- {
- (void)close(serialDevice[reader_index].fd);
- serialDevice[reader_index].fd = -1;
- DEBUG_CRITICAL2("tcsetattr error: %s", strerror(errno));
-
- return STATUS_UNSUCCESSFUL;
- }
-
- /* Test current speed issuing a CmdGetSlotStatus with a very
- * short time out of 1 seconds */
- old_timeout = serialDevice[reader_index].ccid.readTimeout;
-
- serialDevice[reader_index].ccid.readTimeout = 1*1000;
- r = CmdGetSlotStatus(reader_index, pcbuffer);
-
- /* Restore default time out value */
- serialDevice[reader_index].ccid.readTimeout = old_timeout;
-
- if (IFD_SUCCESS == r)
- {
- /* We are at 9600 bauds, let's move to 115200 */
- unsigned char tx_buffer[] = { 0x01, 0x10, 0x20 };
- unsigned char rx_buffer[50];
- unsigned int rx_length = sizeof(rx_buffer);
-
- if (IFD_SUCCESS == CmdEscape(reader_index, tx_buffer,
- sizeof(tx_buffer), rx_buffer, &rx_length, 0))
- {
- /* Let the reader setup its new communication speed */
- (void)usleep(250*1000);
- }
- else
- {
- DEBUG_INFO1("CmdEscape to configure 115200 bauds failed");
- }
- }
- /* In case of a failure, reader is probably already at 115200
- * bauds as code below assumes */
- }
-
- /* set serial port speed to 115200 bauds */
- (void)cfsetspeed(¤t_termios, B115200);
-
- DEBUG_INFO1("Set serial port baudrate to 115200 and correct configuration");
- if (tcsetattr(serialDevice[reader].fd, TCSANOW, ¤t_termios) == -1)
- {
- (void)close(serialDevice[reader].fd);
- serialDevice[reader].fd = -1;
- DEBUG_INFO2("tcsetattr error: %s", strerror(errno));
-
- return STATUS_UNSUCCESSFUL;
- }
-
- /* perform a command to be sure a Gemalto reader is connected
- * get the reader firmware */
- {
- unsigned char tx_buffer[] = { 0x02 };
- unsigned char rx_buffer[50];
- unsigned int rx_length = sizeof(rx_buffer);
-
- /* 2 seconds timeout to not wait too long if no reader is connected */
- if (IFD_SUCCESS != CmdEscape(reader_index, tx_buffer, sizeof(tx_buffer),
- rx_buffer, &rx_length, 2*1000))
- {
- DEBUG_CRITICAL("Get firmware failed. Maybe the reader is not connected");
- (void)CloseSerial(reader_index);
- return STATUS_UNSUCCESSFUL;
- }
-
- rx_buffer[rx_length] = '\0';
- DEBUG_INFO2("Firmware: %s", rx_buffer);
- }
-
- /* perform a command to configure GemPC Twin reader card movement
- * notification to synchronous mode: the card movement is notified _after_
- * the host command and _before_ the reader anwser */
- {
- unsigned char tx_buffer[] = { 0x01, 0x01, 0x01};
- unsigned char rx_buffer[50];
- unsigned int rx_length = sizeof(rx_buffer);
-
- if (IFD_SUCCESS != CmdEscape(reader_index, tx_buffer, sizeof(tx_buffer),
- rx_buffer, &rx_length, 0))
- {
- DEBUG_CRITICAL("Change card movement notification failed.");
- (void)CloseSerial(reader_index);
- return STATUS_UNSUCCESSFUL;
- }
- }
-
- serialDevice[reader_index].ccid.sIFD_serial_number = NULL;
- serialDevice[reader_index].ccid.sIFD_iManufacturer = NULL;
- serialDevice[reader_index].ccid.IFD_bcdDevice = 0;
-
- return STATUS_SUCCESS;
-} /* OpenSerialByName */
-
-
-/*****************************************************************************
- *
- * CloseSerial: close the port
- *
- *****************************************************************************/
-status_t CloseSerial(unsigned int reader_index)
-{
- unsigned int reader = reader_index;
-
- /* device not opened */
- if (NULL == serialDevice[reader_index].device)
- return STATUS_UNSUCCESSFUL;
-
- DEBUG_COMM2("Closing serial device: %s", serialDevice[reader_index].device);
-
- /* Decrement number of opened slot */
- (*serialDevice[reader_index].nb_opened_slots)--;
-
- /* release the allocated ressources for the last slot only */
- if (0 == *serialDevice[reader_index].nb_opened_slots)
- {
- DEBUG_COMM("Last slot closed. Release resources");
-
- (void)close(serialDevice[reader].fd);
- serialDevice[reader].fd = -1;
-
- free(serialDevice[reader].device);
- serialDevice[reader].device = NULL;
- }
-
- return STATUS_SUCCESS;
-} /* CloseSerial */
-
-
-/*****************************************************************************
- *
- * get_ccid_descriptor
- *
- ****************************************************************************/
-_ccid_descriptor *get_ccid_descriptor(unsigned int reader_index)
-{
- return &serialDevice[reader_index].ccid;
-} /* get_ccid_descriptor */
-
-
diff --git a/src/ccid_serial.h b/src/ccid_serial.h
deleted file mode 100644
index c946dd0..0000000
--- a/src/ccid_serial.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- ccid_serial.h: Serial access routines
- Copyright (C) 2003-2008 Ludovic Rousseau
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#ifndef __CCID_SERAL_H__
-#define __CCID_SERAL_H__
-
-status_t OpenSerial(unsigned int reader_index, int channel);
-
-status_t OpenSerialByName(unsigned int reader_index, char *dev_name);
-
-status_t WriteSerial(unsigned int reader_index, unsigned int length,
- unsigned char *Buffer);
-
-status_t ReadSerial(unsigned int reader_index, unsigned int *length,
- unsigned char *Buffer);
-
-status_t CloseSerial(unsigned int reader_index);
-
-#endif
diff --git a/src/ccid_twin_serial.c b/src/ccid_twin_serial.c
new file mode 100644
index 0000000..217ab7d
--- /dev/null
+++ b/src/ccid_twin_serial.c
@@ -0,0 +1,916 @@
+/*
+ * ccid_twin_serial.c: communicate with a GemPC Twin smart card reader
+ * Copyright (C) 2001-2010 Ludovic Rousseau <ludovic.rousseau at free.fr>
+ *
+ * Thanks to Niki W. Waibel <niki.waibel at gmx.net> for a prototype version
+ *
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <termios.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <ifdhandler.h>
+
+#include <config.h>
+#include "defs.h"
+#include "ccid_ifdhandler.h"
+#include "debug.h"
+#include "ccid.h"
+#include "utils.h"
+#include "commands.h"
+#include "parser.h"
+#include "strlcpycat.h"
+
+#define SYNC 0x03
+#define CTRL_ACK 0x06
+#define CTRL_NAK 0x15
+#define RDR_to_PC_NotifySlotChange 0x50
+#define CARD_ABSENT 0x02
+#define CARD_PRESENT 0x03
+
+/*
+ * normal command:
+ * 1 : SYNC
+ * 1 : CTRL
+ * 10 +data length : CCID command
+ * 1 : LRC
+ *
+ * SYNC : 0x03
+ * CTRL : ACK (0x06) or NAK (0x15)
+ * CCID command : see USB CCID specs
+ * LRC : xor of all the previous byes
+ *
+ * Error message:
+ * 1 : SYNC (0x03)
+ * 1 : CTRL (NAK: 0x15)
+ * 1 : LRC (0x16)
+ *
+ * Card insertion/withdrawal
+ * 1 : RDR_to_PC_NotifySlotChange (0x50)
+ * 1 : bmSlotIccState
+ * 0x02 if card absent
+ * 0x03 is card present
+ *
+ * Time request
+ * T=1 : normal CCID command
+ * T=0 : 1 byte (value between 0x80 and 0xFF)
+ *
+ */
+
+/*
+ * You may get read timeout after a card movement.
+ * This is because you will get the echo of the CCID command
+ * but not the result of the command.
+ *
+ * This is not an applicative issue since the card is either removed (and
+ * powered off) or just inserted (and not yet powered on).
+ */
+
+/* 271 = max size for short APDU
+ * 2 bytes for header
+ * 1 byte checksum
+ * doubled for echo
+ */
+#define GEMPCTWIN_MAXBUF (271 +2 +1) * 2
+
+typedef struct
+{
+ /*
+ * File handle on the serial port
+ */
+ int fd;
+
+ /*
+ * device used ("/dev/ttyS?" under Linux)
+ */
+ /*@null@*/ char *device;
+
+ /*
+ * Number of slots using the same device
+ */
+ int real_nb_opened_slots;
+ int *nb_opened_slots;
+
+ /*
+ * does the reader echoes the serial communication bytes?
+ */
+ int echo;
+
+ /*
+ * serial communication buffer
+ */
+ unsigned char buffer[GEMPCTWIN_MAXBUF];
+
+ /*
+ * next available byte
+ */
+ int buffer_offset;
+
+ /*
+ * number of available bytes
+ */
+ int buffer_offset_last;
+
+ /*
+ * CCID infos common to USB and serial
+ */
+ _ccid_descriptor ccid;
+
+} _serialDevice;
+
+/* The _serialDevice structure must be defined before including ccid_serial.h */
+#include "ccid_twin_serial.h"
+
+/* data rates supported by the GemPC Twin (serial and PCMCIA) */
+unsigned int SerialTwinDataRates[] = { ISO_DATA_RATES, 0 };
+
+/* data rates supported by the GemPC PinPad, GemCore Pos Pro & SIM Pro */
+unsigned int SerialExtendedDataRates[] = { ISO_DATA_RATES, 500000, 0 };
+
+/* data rates supported by the secondary slots on the GemCore Pos Pro & SIM Pro */
+unsigned int SerialCustomDataRates[] = { GEMPLUS_CUSTOM_DATA_RATES, 0 };
+
+/* data rates supported by the GemCore SIM Pro 2 */
+unsigned int SIMPro2DataRates[] = { SIMPRO2_ISO_DATA_RATES, 0 };
+
+/* no need to initialize to 0 since it is static */
+static _serialDevice serialDevice[CCID_DRIVER_MAX_READERS];
+
+/* unexported functions */
+static int ReadChunk(unsigned int reader_index, unsigned char *buffer,
+ int buffer_length, int min_length);
+
+static int get_bytes(unsigned int reader_index, /*@out@*/ unsigned char *buffer,
+ int length);
+
+
+/*****************************************************************************
+ *
+ * WriteTwinSerial: Send bytes to the card reader
+ *
+ *****************************************************************************/
+status_t WriteTwinSerial(unsigned int reader_index, unsigned int length,
+ unsigned char *buffer)
+{
+ unsigned int i;
+ unsigned char lrc;
+ unsigned char low_level_buffer[GEMPCTWIN_MAXBUF];
+
+ char debug_header[] = "-> 123456 ";
+
+ (void)snprintf(debug_header, sizeof(debug_header), "-> %06X ",
+ reader_index);
+
+ if (length > GEMPCTWIN_MAXBUF-3)
+ {
+ DEBUG_CRITICAL3("command too long: %d for max %d",
+ length, GEMPCTWIN_MAXBUF-3);
+ return STATUS_UNSUCCESSFUL;
+ }
+
+ /* header */
+ low_level_buffer[0] = 0x03; /* SYNC */
+ low_level_buffer[1] = 0x06; /* ACK */
+
+ /* CCID command */
+ memcpy(low_level_buffer+2, buffer, length);
+
+ /* checksum */
+ lrc = 0;
+ for(i=0; i<length+2; i++)
+ lrc ^= low_level_buffer[i];
+ low_level_buffer[length+2] = lrc;
+
+ DEBUG_XXD(debug_header, low_level_buffer, length+3);
+
+ if (write(serialDevice[reader_index].fd, low_level_buffer,
+ length+3) != length+3)
+ {
+ DEBUG_CRITICAL2("write error: %s", strerror(errno));
+ return STATUS_UNSUCCESSFUL;
+ }
+
+ return STATUS_SUCCESS;
+} /* WriteTwinSerial */
+
+
+/*****************************************************************************
+ *
+ * ReadTwinSerial: Receive bytes from the card reader
+ *
+ *****************************************************************************/
+status_t ReadTwinSerial(unsigned int reader_index,
+ unsigned int *length, unsigned char *buffer)
+{
+ unsigned char c;
+ int rv;
+ int echo;
+ int to_read;
+ int i;
+
+ /* we get the echo first */
+ echo = serialDevice[reader_index].echo;
+
+start:
+ DEBUG_COMM("start");
+ if ((rv = get_bytes(reader_index, &c, 1)) != STATUS_SUCCESS)
+ return rv;
+
+ if (c == RDR_to_PC_NotifySlotChange)
+ goto slot_change;
+
+ if (c == SYNC)
+ goto sync;
+
+ if (c >= 0x80)
+ {
+ DEBUG_COMM2("time request: 0x%02X", c);
+ goto start;
+ }
+
+ DEBUG_CRITICAL2("Got 0x%02X", c);
+ return STATUS_COMM_ERROR;
+
+slot_change:
+ DEBUG_COMM("slot change");
+ if ((rv = get_bytes(reader_index, &c, 1)) != STATUS_SUCCESS)
+ return rv;
+
+ if (c == CARD_ABSENT)
+ {
+ DEBUG_COMM("Card removed");
+ }
+ else
+ if (c == CARD_PRESENT)
+ {
+ DEBUG_COMM("Card inserted");
+ }
+ else
+ {
+ DEBUG_COMM2("Unknown card movement: %d", c);
+ }
+ goto start;
+
+sync:
+ DEBUG_COMM("sync");
+ if ((rv = get_bytes(reader_index, &c, 1)) != STATUS_SUCCESS)
+ return rv;
+
+ if (c == CTRL_ACK)
+ goto ack;
+
+ if (c == CTRL_NAK)
+ goto nak;
+
+ DEBUG_CRITICAL2("Got 0x%02X instead of ACK/NAK", c);
+ return STATUS_COMM_ERROR;
+
+nak:
+ DEBUG_COMM("nak");
+ if ((rv = get_bytes(reader_index, &c, 1)) != STATUS_SUCCESS)
+ return rv;
+
+ if (c != (SYNC ^ CTRL_NAK))
+ {
+ DEBUG_CRITICAL2("Wrong LRC: 0x%02X", c);
+ return STATUS_COMM_ERROR;
+ }
+ else
+ {
+ DEBUG_COMM("NAK requested");
+ return STATUS_COMM_NAK;
+ }
+
+ack:
+ DEBUG_COMM("ack");
+ /* normal CCID frame */
+ if ((rv = get_bytes(reader_index, buffer, 5)) != STATUS_SUCCESS)
+ return rv;
+
+ /* total frame size */
+ to_read = 10+dw2i(buffer, 1);
+
+ if ((to_read < 10) || (to_read > (int)*length))
+ {
+ DEBUG_CRITICAL2("Wrong value for frame size: %d", to_read);
+ return STATUS_COMM_ERROR;
+ }
+
+ DEBUG_COMM2("frame size: %d", to_read);
+ if ((rv = get_bytes(reader_index, buffer+5, to_read-5)) != STATUS_SUCCESS)
+ return rv;
+
+ DEBUG_XXD("frame: ", buffer, to_read);
+
+ /* lrc */
+ DEBUG_COMM("lrc");
+ if ((rv = get_bytes(reader_index, &c, 1)) != STATUS_SUCCESS)
+ return rv;
+
+ DEBUG_COMM2("lrc: 0x%02X", c);
+ for (i=0; i<to_read; i++)
+ c ^= buffer[i];
+
+ if (c != (SYNC ^ CTRL_ACK))
+ DEBUG_CRITICAL2("Wrong LRC: 0x%02X", c);
+
+ if (echo)
+ {
+ echo = FALSE;
+ goto start;
+ }
+
+ /* length of data read */
+ *length = to_read;
+
+ return STATUS_SUCCESS;
+} /* ReadTwinSerial */
+
+
+/*****************************************************************************
+ *
+ * get_bytes: get n bytes
+ *
+ *****************************************************************************/
+int get_bytes(unsigned int reader_index, unsigned char *buffer, int length)
+{
+ int offset = serialDevice[reader_index].buffer_offset;
+ int offset_last = serialDevice[reader_index].buffer_offset_last;
+
+ DEBUG_COMM3("available: %d, needed: %d", offset_last-offset,
+ length);
+ /* enough data are available */
+ if (offset + length <= offset_last)
+ {
+ DEBUG_COMM("data available");
+ memcpy(buffer, serialDevice[reader_index].buffer + offset, length);
+ serialDevice[reader_index].buffer_offset += length;
+ }
+ else
+ {
+ int present, rv;
+
+ /* copy available data */
+ present = offset_last - offset;
+
+ if (present > 0)
+ {
+ DEBUG_COMM2("some data available: %d", present);
+ memcpy(buffer, serialDevice[reader_index].buffer + offset,
+ present);
+ }
+
+ /* get fresh data */
+ DEBUG_COMM2("get more data: %d", length - present);
+ rv = ReadChunk(reader_index, serialDevice[reader_index].buffer,
+ sizeof(serialDevice[reader_index].buffer), length - present);
+ if (rv < 0)
+ return STATUS_COMM_ERROR;
+
+ /* fill the buffer */
+ memcpy(buffer + present, serialDevice[reader_index].buffer,
+ length - present);
+ serialDevice[reader_index].buffer_offset = length - present;
+ serialDevice[reader_index].buffer_offset_last = rv;
+ DEBUG_COMM3("offset: %d, last_offset: %d",
+ serialDevice[reader_index].buffer_offset,
+ serialDevice[reader_index].buffer_offset_last);
+ }
+
+ return STATUS_SUCCESS;
+} /* get_bytes */
+
+
+/*****************************************************************************
+ *
+ * ReadChunk: read a minimum number of bytes
+ *
+ *****************************************************************************/
+static int ReadChunk(unsigned int reader_index, unsigned char *buffer,
+ int buffer_length, int min_length)
+{
+ int fd = serialDevice[reader_index].fd;
+# ifndef S_SPLINT_S
+ fd_set fdset;
+# endif
+ struct timeval t;
+ int i, rv = 0;
+ int already_read;
+ char debug_header[] = "<- 123456 ";
+
+ (void)snprintf(debug_header, sizeof(debug_header), "<- %06X ",
+ reader_index);
+
+ already_read = 0;
+ while (already_read < min_length)
+ {
+ /* use select() to, eventually, timeout */
+ FD_ZERO(&fdset);
+ FD_SET(fd, &fdset);
+ t.tv_sec = serialDevice[reader_index].ccid.readTimeout / 1000;
+ t.tv_usec = (serialDevice[reader_index].ccid.readTimeout - t.tv_sec*1000)*1000;
+
+ i = select(fd+1, &fdset, NULL, NULL, &t);
+ if (i == -1)
+ {
+ DEBUG_CRITICAL2("select: %s", strerror(errno));
+ return -1;
+ }
+ else
+ if (i == 0)
+ {
+ DEBUG_COMM2("Timeout! (%d ms)", serialDevice[reader_index].ccid.readTimeout);
+ return -1;
+ }
+
+ rv = read(fd, buffer + already_read, buffer_length - already_read);
+ if (rv < 0)
+ {
+ DEBUG_COMM2("read error: %s", strerror(errno));
+ return -1;
+ }
+
+ DEBUG_XXD(debug_header, buffer + already_read, rv);
+
+ already_read += rv;
+ DEBUG_COMM3("read: %d, to read: %d", already_read,
+ min_length);
+ }
+
+ return already_read;
+} /* ReadChunk */
+
+
+/*****************************************************************************
+ *
+ * OpenTwinSerial: open the port
+ *
+ *****************************************************************************/
+status_t OpenTwinSerial(unsigned int reader_index, int channel)
+{
+ char dev_name[FILENAME_MAX];
+
+ DEBUG_COMM3("Reader index: %X, Channel: %d", reader_index, channel);
+
+ /*
+ * Conversion of old-style ifd-hanler 1.0 CHANNELID
+ */
+ if (channel == 0x0103F8)
+ channel = 1;
+ else
+ if (channel == 0x0102F8)
+ channel = 2;
+ else
+ if (channel == 0x0103E8)
+ channel = 3;
+ else
+ if (channel == 0x0102E8)
+ channel = 4;
+
+ if (channel < 0)
+ {
+ DEBUG_CRITICAL2("wrong port number: %d", channel);
+ return STATUS_UNSUCCESSFUL;
+ }
+
+ (void)snprintf(dev_name, sizeof(dev_name), "/dev/pcsc/%d", channel);
+
+ return OpenTwinSerialByName(reader_index, dev_name);
+} /* OpenTwinSerial */
+
+/*****************************************************************************
+ *
+ * set_ccid_descriptor: init ccid descriptor
+ * depending on reader type specified in device.
+ *
+ * return: STATUS_UNSUCCESSFUL,
+ * STATUS_SUCCESS,
+ * -1 (Reader already used)
+ *
+ *****************************************************************************/
+static status_t set_ccid_descriptor(unsigned int reader_index,
+ const char *reader_name, const char *dev_name)
+{
+ int readerID;
+ int i;
+ int already_used = FALSE;
+ static int previous_reader_index = -1;
+
+ readerID = GEMPCTWIN;
+ if (0 == strcasecmp(reader_name,"GemCorePOSPro"))
+ readerID = GEMCOREPOSPRO;
+ else if (0 == strcasecmp(reader_name,"GemCoreSIMPro"))
+ readerID = GEMCORESIMPRO;
+ else if (0 == strcasecmp(reader_name,"GemCoreSIMPro2"))
+ readerID = GEMCORESIMPRO2;
+ else if (0 == strcasecmp(reader_name,"GemPCPinPad"))
+ readerID = GEMPCPINPAD;
+
+ /* check if the same channel is not already used to manage multi-slots readers*/
+ for (i = 0; i < CCID_DRIVER_MAX_READERS; i++)
+ {
+ if (serialDevice[i].device
+ && strcmp(serialDevice[i].device, dev_name) == 0)
+ {
+ already_used = TRUE;
+
+ DEBUG_COMM2("%s already used. Multi-slot reader?", dev_name);
+ break;
+ }
+ }
+
+ /* this reader is already managed by us */
+ if (already_used)
+ {
+ if ((previous_reader_index != -1)
+ && serialDevice[previous_reader_index].device
+ && (strcmp(serialDevice[previous_reader_index].device, dev_name) == 0)
+ && serialDevice[previous_reader_index].ccid.bCurrentSlotIndex < serialDevice[previous_reader_index].ccid.bMaxSlotIndex)
+ {
+ /* we reuse the same device and the reader is multi-slot */
+ serialDevice[reader_index] = serialDevice[previous_reader_index];
+
+ *serialDevice[reader_index].nb_opened_slots += 1;
+ serialDevice[reader_index].ccid.bCurrentSlotIndex++;
+ serialDevice[reader_index].ccid.dwSlotStatus = IFD_ICC_PRESENT;
+ DEBUG_INFO2("Opening slot: %d",
+ serialDevice[reader_index].ccid.bCurrentSlotIndex);
+ switch (readerID)
+ {
+ case GEMCOREPOSPRO:
+ case GEMCORESIMPRO:
+ {
+ /* Allocate a memory buffer that will be
+ * released in CloseUSB() */
+ void *ptr = malloc(sizeof SerialCustomDataRates);
+ if (ptr)
+ {
+ memcpy(ptr, SerialCustomDataRates,
+ sizeof SerialCustomDataRates);
+ }
+
+ serialDevice[reader_index].ccid.arrayOfSupportedDataRates = ptr;
+ }
+ serialDevice[reader_index].ccid.dwMaxDataRate = 125000;
+ break;
+
+ /* GemPC Twin or GemPC Card */
+ default:
+ serialDevice[reader_index].ccid.arrayOfSupportedDataRates = SerialTwinDataRates;
+ serialDevice[reader_index].ccid.dwMaxDataRate = 344086;
+ break;
+ }
+ goto end;
+ }
+ else
+ {
+ DEBUG_CRITICAL2("Trying to open too many slots on %s", dev_name);
+ return STATUS_UNSUCCESSFUL;
+ }
+
+ }
+
+ /* Common to all readers */
+ serialDevice[reader_index].ccid.real_bSeq = 0;
+ serialDevice[reader_index].ccid.pbSeq = &serialDevice[reader_index].ccid.real_bSeq;
+ serialDevice[reader_index].real_nb_opened_slots = 1;
+ serialDevice[reader_index].nb_opened_slots = &serialDevice[reader_index].real_nb_opened_slots;
+ serialDevice[reader_index].ccid.bCurrentSlotIndex = 0;
+
+ serialDevice[reader_index].ccid.dwMaxCCIDMessageLength = 271;
+ serialDevice[reader_index].ccid.dwMaxIFSD = 254;
+ serialDevice[reader_index].ccid.dwFeatures = 0x00010230;
+ serialDevice[reader_index].ccid.dwDefaultClock = 4000;
+
+ serialDevice[reader_index].buffer_offset = 0;
+ serialDevice[reader_index].buffer_offset_last = 0;
+
+ serialDevice[reader_index].ccid.readerID = readerID;
+ serialDevice[reader_index].ccid.bPINSupport = 0x0;
+ serialDevice[reader_index].ccid.dwMaxDataRate = 344086;
+ serialDevice[reader_index].ccid.bMaxSlotIndex = 0;
+ serialDevice[reader_index].ccid.arrayOfSupportedDataRates = SerialTwinDataRates;
+ serialDevice[reader_index].ccid.readTimeout = DEFAULT_COM_READ_TIMEOUT;
+ serialDevice[reader_index].ccid.dwSlotStatus = IFD_ICC_PRESENT;
+ serialDevice[reader_index].ccid.bVoltageSupport = 0x07; /* 1.8V, 3V and 5V */
+ serialDevice[reader_index].ccid.gemalto_firmware_features = NULL;
+ serialDevice[reader_index].echo = TRUE;
+
+ /* change some values depending on the reader */
+ switch (readerID)
+ {
+ case GEMCOREPOSPRO:
+ serialDevice[reader_index].ccid.bMaxSlotIndex = 4; /* 5 slots */
+ serialDevice[reader_index].ccid.arrayOfSupportedDataRates = SerialExtendedDataRates;
+ serialDevice[reader_index].echo = FALSE;
+ serialDevice[reader_index].ccid.dwMaxDataRate = 500000;
+ break;
+
+ case GEMCORESIMPRO:
+ serialDevice[reader_index].ccid.bMaxSlotIndex = 1; /* 2 slots */
+ serialDevice[reader_index].ccid.arrayOfSupportedDataRates = SerialExtendedDataRates;
+ serialDevice[reader_index].echo = FALSE;
+ serialDevice[reader_index].ccid.dwMaxDataRate = 500000;
+ break;
+
+ case GEMCORESIMPRO2:
+ serialDevice[reader_index].ccid.dwDefaultClock = 4800;
+ serialDevice[reader_index].ccid.bMaxSlotIndex = 1; /* 2 slots */
+ serialDevice[reader_index].ccid.arrayOfSupportedDataRates = SIMPro2DataRates;
+ serialDevice[reader_index].echo = FALSE;
+ serialDevice[reader_index].ccid.dwMaxDataRate = 825806;
+ break;
+
+ case GEMPCPINPAD:
+ serialDevice[reader_index].ccid.bPINSupport = 0x03;
+ serialDevice[reader_index].ccid.arrayOfSupportedDataRates = SerialExtendedDataRates;
+ serialDevice[reader_index].ccid.dwMaxDataRate = 500000;
+ break;
+ }
+
+end:
+ /* memorise the current reader_index so we can detect
+ * a new OpenTwinSerialByName on a multi slot reader */
+ previous_reader_index = reader_index;
+
+ /* we just created a secondary slot on a multi-slot reader */
+ if (already_used)
+ return STATUS_SECONDARY_SLOT;
+
+ return STATUS_SUCCESS;
+} /* set_ccid_descriptor */
+
+
+/*****************************************************************************
+ *
+ * OpenTwinSerialByName: open the port
+ *
+ *****************************************************************************/
+status_t OpenTwinSerialByName(unsigned int reader_index, char *dev_name)
+{
+ struct termios current_termios;
+ unsigned int reader = reader_index;
+ /* 255 is MAX_DEVICENAME in pcscd.h */
+ char reader_name[255] = "GemPCTwin";
+ char *p;
+ status_t ret;
+
+ DEBUG_COMM3("Reader index: %X, Device: %s", reader_index, dev_name);
+
+ /* parse dev_name using the pattern "device:name" */
+ p = strchr(dev_name, ':');
+ if (p)
+ {
+ /* copy the second part of the string */
+ strlcpy(reader_name, p+1, sizeof(reader_name));
+
+ /* replace ':' by '\0' so that dev_name only contains the device name */
+ *p = '\0';
+ }
+
+ ret = set_ccid_descriptor(reader_index, reader_name, dev_name);
+ if (STATUS_UNSUCCESSFUL == ret)
+ return STATUS_UNSUCCESSFUL;
+
+ /* secondary slot so do not physically open the device */
+ if (STATUS_SECONDARY_SLOT == ret)
+ return STATUS_SUCCESS;
+
+ serialDevice[reader].fd = open(dev_name, O_RDWR | O_NOCTTY);
+
+ if (-1 == serialDevice[reader].fd)
+ {
+ DEBUG_CRITICAL3("open %s: %s", dev_name, strerror(errno));
+ return STATUS_UNSUCCESSFUL;
+ }
+
+ /* Set RTS signal to low to prevent the smart card reader
+ * from sending its plug and play string. */
+ {
+ int flags;
+
+ if (ioctl(serialDevice[reader].fd, TIOCMGET, &flags) < 0)
+ {
+ DEBUG_CRITICAL2("Get RS232 signals state failed: %s",
+ strerror(errno));
+ }
+ else
+ {
+ flags &= ~TIOCM_RTS;
+ if (ioctl(serialDevice[reader].fd, TIOCMSET, &flags) < 0)
+ {
+ DEBUG_CRITICAL2("Set RTS to low failed: %s", strerror(errno));
+ }
+ else
+ {
+ DEBUG_COMM("Plug-n-Play inhibition successful");
+ }
+ }
+ }
+
+ /* set channel used */
+ serialDevice[reader].device = strdup(dev_name);
+
+ /* empty in and out serial buffers */
+ if (tcflush(serialDevice[reader].fd, TCIOFLUSH))
+ DEBUG_INFO2("tcflush() function error: %s", strerror(errno));
+
+ /* get config attributes */
+ if (tcgetattr(serialDevice[reader].fd, ¤t_termios) == -1)
+ {
+ DEBUG_INFO2("tcgetattr() function error: %s", strerror(errno));
+ (void)close(serialDevice[reader].fd);
+ serialDevice[reader].fd = -1;
+
+ return STATUS_UNSUCCESSFUL;
+ }
+
+ /* IGNBRK: ignore BREAK condition on input
+ * IGNPAR: ignore framing errors and parity errors. */
+ current_termios.c_iflag = IGNBRK | IGNPAR;
+ current_termios.c_oflag = 0; /* Raw output modes */
+ /* CS8: 8-bits character size
+ * CSTOPB: set two stop bits
+ * CREAD: enable receiver
+ * CLOCAL: ignore modem control lines */
+ current_termios.c_cflag = CS8 | CSTOPB | CREAD | CLOCAL;
+
+ /* Do not echo characters because if you connect to a host it or your modem
+ * will echo characters for you. Don't generate signals. */
+ current_termios.c_lflag = 0;
+
+ if (0 == strcasecmp(reader_name,"GemCoreSIMPro2"))
+ {
+ unsigned char pcbuffer[SIZE_GET_SLOT_STATUS];
+ unsigned int old_timeout;
+ RESPONSECODE r;
+
+ /* Unless we resume from a stand-by condition, GemCoreSIMPro2
+ * starts at 9600 bauds, so let's first try this speed */
+ /* set serial port speed to 9600 bauds */
+ (void)cfsetspeed(¤t_termios, B9600);
+ DEBUG_INFO1("Set serial port baudrate to 9600 and correct configuration");
+ if (tcsetattr(serialDevice[reader_index].fd, TCSANOW, ¤t_termios) == -1)
+ {
+ (void)close(serialDevice[reader_index].fd);
+ serialDevice[reader_index].fd = -1;
+ DEBUG_CRITICAL2("tcsetattr error: %s", strerror(errno));
+
+ return STATUS_UNSUCCESSFUL;
+ }
+
+ /* Test current speed issuing a CmdGetSlotStatus with a very
+ * short time out of 1 seconds */
+ old_timeout = serialDevice[reader_index].ccid.readTimeout;
+
+ serialDevice[reader_index].ccid.readTimeout = 1*1000;
+ r = CmdGetSlotStatus(reader_index, pcbuffer);
+
+ /* Restore default time out value */
+ serialDevice[reader_index].ccid.readTimeout = old_timeout;
+
+ if (IFD_SUCCESS == r)
+ {
+ /* We are at 9600 bauds, let's move to 115200 */
+ unsigned char tx_buffer[] = { 0x01, 0x10, 0x20 };
+ unsigned char rx_buffer[50];
+ unsigned int rx_length = sizeof(rx_buffer);
+
+ if (IFD_SUCCESS == CmdEscape(reader_index, tx_buffer,
+ sizeof(tx_buffer), rx_buffer, &rx_length, 0))
+ {
+ /* Let the reader setup its new communication speed */
+ (void)usleep(250*1000);
+ }
+ else
+ {
+ DEBUG_INFO1("CmdEscape to configure 115200 bauds failed");
+ }
+ }
+ /* In case of a failure, reader is probably already at 115200
+ * bauds as code below assumes */
+ }
+
+ /* set serial port speed to 115200 bauds */
+ (void)cfsetspeed(¤t_termios, B115200);
+
+ DEBUG_INFO1("Set serial port baudrate to 115200 and correct configuration");
+ if (tcsetattr(serialDevice[reader].fd, TCSANOW, ¤t_termios) == -1)
+ {
+ (void)close(serialDevice[reader].fd);
+ serialDevice[reader].fd = -1;
+ DEBUG_INFO2("tcsetattr error: %s", strerror(errno));
+
+ return STATUS_UNSUCCESSFUL;
+ }
+
+ /* perform a command to be sure a Gemalto reader is connected
+ * get the reader firmware */
+ {
+ unsigned char tx_buffer[] = { 0x02 };
+ unsigned char rx_buffer[50];
+ unsigned int rx_length = sizeof(rx_buffer);
+
+ /* 2 seconds timeout to not wait too long if no reader is connected */
+ if (IFD_SUCCESS != CmdEscape(reader_index, tx_buffer, sizeof(tx_buffer),
+ rx_buffer, &rx_length, 2*1000))
+ {
+ DEBUG_CRITICAL("Get firmware failed. Maybe the reader is not connected");
+ (void)CloseTwinSerial(reader_index);
+ return STATUS_UNSUCCESSFUL;
+ }
+
+ rx_buffer[rx_length] = '\0';
+ DEBUG_INFO2("Firmware: %s", rx_buffer);
+ }
+
+ /* perform a command to configure GemPC Twin reader card movement
+ * notification to synchronous mode: the card movement is notified _after_
+ * the host command and _before_ the reader anwser */
+ {
+ unsigned char tx_buffer[] = { 0x01, 0x01, 0x01};
+ unsigned char rx_buffer[50];
+ unsigned int rx_length = sizeof(rx_buffer);
+
+ if (IFD_SUCCESS != CmdEscape(reader_index, tx_buffer, sizeof(tx_buffer),
+ rx_buffer, &rx_length, 0))
+ {
+ DEBUG_CRITICAL("Change card movement notification failed.");
+ (void)CloseTwinSerial(reader_index);
+ return STATUS_UNSUCCESSFUL;
+ }
+ }
+
+ serialDevice[reader_index].ccid.sIFD_serial_number = NULL;
+ serialDevice[reader_index].ccid.sIFD_iManufacturer = NULL;
+ serialDevice[reader_index].ccid.IFD_bcdDevice = 0;
+
+ return STATUS_SUCCESS;
+} /* OpenTwinSerialByName */
+
+
+/*****************************************************************************
+ *
+ * CloseTwinSerial: close the port
+ *
+ *****************************************************************************/
+status_t CloseTwinSerial(unsigned int reader_index)
+{
+ unsigned int reader = reader_index;
+
+ /* device not opened */
+ if (NULL == serialDevice[reader_index].device)
+ return STATUS_UNSUCCESSFUL;
+
+ DEBUG_COMM2("Closing serial device: %s", serialDevice[reader_index].device);
+
+ /* Decrement number of opened slot */
+ (*serialDevice[reader_index].nb_opened_slots)--;
+
+ /* release the allocated ressources for the last slot only */
+ if (0 == *serialDevice[reader_index].nb_opened_slots)
+ {
+ DEBUG_COMM("Last slot closed. Release resources");
+
+ (void)close(serialDevice[reader].fd);
+ serialDevice[reader].fd = -1;
+
+ free(serialDevice[reader].device);
+ serialDevice[reader].device = NULL;
+ }
+
+ return STATUS_SUCCESS;
+} /* CloseTwinSerial */
+
+
+/*****************************************************************************
+ *
+ * get_ccid_descriptor
+ *
+ ****************************************************************************/
+_ccid_descriptor *get_ccid_descriptor(unsigned int reader_index)
+{
+ return &serialDevice[reader_index].ccid;
+} /* get_ccid_descriptor */
+
+
diff --git a/src/ccid_twin_serial.h b/src/ccid_twin_serial.h
new file mode 100644
index 0000000..051b62f
--- /dev/null
+++ b/src/ccid_twin_serial.h
@@ -0,0 +1,35 @@
+/*
+ ccid_twin_serial.h: Serial access routines
+ Copyright (C) 2003-2008 Ludovic Rousseau
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef __CCID_TWIN_SERIAL_H__
+#define __CCID_TWIN_SERIAL_H__
+
+status_t OpenTwinSerial(unsigned int reader_index, int channel);
+
+status_t OpenTwinSerialByName(unsigned int reader_index, char *dev_name);
+
+status_t WriteTwinSerial(unsigned int reader_index, unsigned int length,
+ unsigned char *Buffer);
+
+status_t ReadTwinSerial(unsigned int reader_index, unsigned int *length,
+ unsigned char *Buffer);
+
+status_t CloseTwinSerial(unsigned int reader_index);
+
+#endif
diff --git a/src/defs.h b/src/defs.h
index 6523de1..d94a39c 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -91,12 +91,21 @@ typedef enum {
*/
#ifdef TWIN_SERIAL
-#define OpenPortByName OpenSerialByName
-#define OpenPort OpenSerial
-#define ClosePort CloseSerial
-#define ReadPort ReadSerial
-#define WritePort WriteSerial
-#include "ccid_serial.h"
+#define OpenPortByName OpenTwinSerialByName
+#define OpenPort OpenTwinSerial
+#define ClosePort CloseTwinSerial
+#define ReadPort ReadTwinSerial
+#define WritePort WriteTwinSerial
+#include "ccid_twin_serial.h"
+
+#elif HID_SERIAL
+
+#define OpenPortByName OpenHidSerialByName
+#define OpenPort OpenHidSerial
+#define ClosePort CloseHidSerial
+#define ReadPort ReadHidSerial
+#define WritePort WriteHidSerial
+#include "ccid_hid_serial.h"
#else
diff --git a/ylwrap b/ylwrap
index 7c2d927..1c4d776 100755
--- a/ylwrap
+++ b/ylwrap
@@ -1,9 +1,9 @@
#! /bin/sh
# ylwrap - wrapper for lex/yacc invocations.
-scriptversion=2013-01-12.17; # UTC
+scriptversion=2012-12-21.17; # UTC
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
#
# Written by Tom Tromey <tromey at cygnus.com>.
#
@@ -40,7 +40,7 @@ get_dirname ()
# guard FILE
# ----------
# The CPP macro used to guard inclusion of FILE.
-guard ()
+guard()
{
printf '%s\n' "$1" \
| sed \
@@ -96,17 +96,17 @@ esac
# The input.
-input=$1
+input="$1"
shift
# We'll later need for a correct munging of "#line" directives.
input_sub_rx=`get_dirname "$input" | quote_for_sed`
-case $input in
+case "$input" in
[\\/]* | ?:[\\/]*)
# Absolute path; do nothing.
;;
*)
# Relative path. Make it absolute.
- input=`pwd`/$input
+ input="`pwd`/$input"
;;
esac
input_rx=`get_dirname "$input" | quote_for_sed`
@@ -132,8 +132,8 @@ sed_fix_filenames=
# guard in its implementation file.
sed_fix_header_guards=
-while test $# -ne 0; do
- if test x"$1" = x"--"; then
+while test "$#" -ne 0; do
+ if test "$1" = "--"; then
shift
break
fi
@@ -153,14 +153,16 @@ while test $# -ne 0; do
done
# The program to run.
-prog=$1
+prog="$1"
shift
# Make any relative path in $prog absolute.
-case $prog in
+case "$prog" in
[\\/]* | ?:[\\/]*) ;;
- *[\\/]*) prog=`pwd`/$prog ;;
+ *[\\/]*) prog="`pwd`/$prog" ;;
esac
+# FIXME: add hostname here for parallel makes that run commands on
+# other machines. But that might take us over the 14-char limit.
dirname=ylwrap$$
do_exit="cd '`pwd`' && rm -rf $dirname > /dev/null 2>&1;"' (exit $ret); exit $ret'
trap "ret=129; $do_exit" 1
@@ -186,7 +188,7 @@ if test $ret -eq 0; then
# otherwise prepend '../'.
case $to in
[\\/]* | ?:[\\/]*) target=$to;;
- *) target=../$to;;
+ *) target="../$to";;
esac
# Do not overwrite unchanged header files to avoid useless
@@ -195,7 +197,7 @@ if test $ret -eq 0; then
# output of all other files to a temporary file so we can
# compare them to existing versions.
if test $from != $parser; then
- realtarget=$target
+ realtarget="$target"
target=tmp-`printf '%s\n' "$target" | sed 's|.*[\\/]||g'`
fi
More information about the pcsclite-muscle
mailing list