Changeset 959 for trunk/src/ifd

Timestamp:

05/25/07 19:53:49 (5 years ago)

Author:

aj

Message:

add patch by Harald Welte for contactless reader support.

Location:

trunk/src/ifd

Files:

• Makefile.am (modified) (1 diff)
• ifd-ccid.c (modified) (10 diffs)
• init.c (modified) (1 diff)
• internal.h (modified) (1 diff)

trunk/src/ifd/Makefile.am

@@ -21 +21 @@
         \
         proto-gbp.c proto-sync.c proto-t0.c proto-t1.c \
-        proto-trans.c \
+        proto-trans.c proto-escape.c \
         \
         sys-sunray.c sys-solaris.c sys-bsd.c sys-linux.c sys-null.c sys-osx.c \

trunk/src/ifd/ifd-ccid.c

@@ -6 +6 @@
  * 2005-04-20: Harald Welte <laforge@gnumonks.org>
  *      Add support for PCMCIA based CCID Device (CardMan 4040)
+ *
+ * 2005-05-22: Harald Welte <laforge@gnumonks.org>
+ *      Add suport for OmniKey Cardman 5121 RFID extensions
  */
 
@@ -123 +126 @@
 #define SUPPORT_T0      0x1
 #define SUPPORT_T1      0x2
+#define SUPPORT_ESCAPE  0x80
 
 #define SUPPORT_50V     1
@@ -741 +745 @@
         }
 
+        if (de.idVendor == 0x076b && de.idProduct == 0x5121) {
+                /* special handling of RFID part of OmniKey 5121 */
+                reader->nslots++;       /* one virtual slot for RFID escape */
+                st->proto_support |= SUPPORT_ESCAPE;
+        }
+
         return 0;
 }
@@ -816 +826 @@
                 int any = 0;
                 int i, j, bits;
+
+                if (st->proto_support & SUPPORT_ESCAPE
+                    && slot == reader->nslots-1) {
+                        ifd_debug(1, "virtual escape slot, setting card present\n");
+                        *status = IFD_CARD_PRESENT;
+                        return 0;
+                }
 
                 i = 1 + (slot / 4);
@@ -881 +898 @@
 }
 
+static int ccid_set_protocol(ifd_reader_t *reader, int s, int proto);
+
 /*
  * Reset
@@ -899 +918 @@
                 return IFD_ERROR_NO_CARD;
 
+        if (st->proto_support & SUPPORT_ESCAPE
+            && slot == reader->nslots-1) {
+                ifd_debug(1, "slot: %d, setting atr to 0xff", slot);
+                *((char *)atr) = 0xff;
+                ccid_set_protocol(reader, slot, IFD_PROTOCOL_ESCAPE);
+                return 1;
+        }
         memset(ctlbuf, 0, 3);
 
@@ -941 +967 @@
         int r;
 
+        slot = &reader->slot[s];
+
+        /* If we support RFID escaping, we only allow ESCAPE protocol
+         * at the last (== virtual) slot */
+        if ((st->proto_support & SUPPORT_ESCAPE)
+            && (proto != IFD_PROTOCOL_ESCAPE)
+            && (s == reader->nslots-1)) {
+                ct_error("reader doesn't support this protocol at this slot\n");
+                return IFD_ERROR_NOT_SUPPORTED;
+        }
+
         switch (proto) {
         case IFD_PROTOCOL_T0:
@@ -954 +991 @@
                 }
                 break;
+        case IFD_PROTOCOL_ESCAPE:
+                /* virtual "escape" fallthrough protocol for stacking RFID
+                 * protocol stack on top of openct */
+                if (!(st->proto_support & SUPPORT_ESCAPE)) {
+                        ct_error("reader does not support this protocol");
+                        return IFD_ERROR_NOT_SUPPORTED;
+                }
+                if (s != reader->nslots-1) {
+                        ct_error("reader doesn't support this protocol at this slot");
+                        return IFD_ERROR_NOT_SUPPORTED;
+                }
+                p = ifd_protocol_new(IFD_PROTOCOL_ESCAPE,reader, slot->dad);
+                if (!p) {
+                        ct_error("%s: internal error", reader->name);
+                        return -1;
+                }
+                if (slot->proto) {
+                        ifd_protocol_free(slot->proto);
+                        slot->proto = NULL;
+                }
+                slot->proto = p;
+                st->icc_proto[s] = proto;
+                ifd_debug(1, "set protocol to ESCAPE\n");
+                return 0;
+                break;
         default:
                 ct_error("protocol unknown");
                 return IFD_ERROR_NOT_SUPPORTED;
         }
-
-        slot = &reader->slot[s];
 
         if (st->reader_type == TYPE_APDU) {
@@ -1104 +1164 @@
 }
 
+static int ccid_escape(ifd_reader_t *reader, int slot, void *sbuf,
+                       size_t slen, void *rbuf, size_t rlen)
+{
+     unsigned char sendbuf[CCID_MAX_MSG_LEN];
+     unsigned char recvbuf[CCID_MAX_MSG_LEN];
+     int r;
+
+     ifd_debug(1, "slot: %d, slen %d, rlen %d", slot, slen, rlen);
+
+     r = ccid_prepare_cmd(reader, sendbuf, sizeof(sendbuf), slot,
+                          CCID_CMD_ESCAPE, NULL, sbuf, slen);
+     if (r < 0)
+          return r;
+
+     r = ccid_command(reader, &sendbuf[0], r, recvbuf, sizeof(recvbuf));
+     if (r < 0)
+          return r;
+
+     return ccid_extract_data(&recvbuf, r, rbuf, rlen);
+}
+
 static int
 ccid_transparent(ifd_reader_t * reader, int slot,
@@ -1178 +1259 @@
         ccid_driver.send = ccid_send;
         ccid_driver.recv = ccid_recv;
+        ccid_driver.escape = ccid_escape;
 
         ifd_driver_register("ccid", &ccid_driver);

trunk/src/ifd/init.c

@@ -55 +55 @@
         ifd_protocol_register(&ifd_protocol_3wire);
         ifd_protocol_register(&ifd_protocol_eurochip);
+        ifd_protocol_register(&ifd_protocol_esc);
 
         if (ifd_conf_get_integer("debug", &ival) >= 0 && ival > ct_config.debug)

trunk/src/ifd/internal.h

@@ -114 +114 @@
 extern struct ifd_protocol_ops ifd_protocol_3wire;
 extern struct ifd_protocol_ops ifd_protocol_eurochip;
+extern struct ifd_protocol_ops ifd_protocol_esc;
 
 extern void ifd_acr30u_register(void);