+
CFLAGS:=-Wall -g -I/usr/local/include -Iinclude
-LDFLAGS:=-lopenct -lusb
+LDFLAGS:= -lusb
+
+LIBRFID_OBJS=rfid_layer2.o rfid_layer2_iso14443a.o rfid_layer2_iso14443b.o rfid_layer2_iso15693.o rfid_asic_rc632.o rfid_reader_cm5121.o rfid.o rfid_protocol.o rfid_proto_tcl.o rfid_proto_mifare_ul.o rfid_proto_mifare_classic.o rfid_iso14443_common.o rfid_reader.o
+
+# uncomment this if you want to use OpenCT
+LDFLAGS+=-lopenct
+LIBRFID_OBJS+=rfid_reader_cm5121_openct.o
+
+# uncomment this if you want to use our internal CCID driver
+#LIBRFID_OBJS+=rfid_reader_cm5121_ccid_direct.o ccid/ccid-driver.o
all: openct-escape
openct-escape: openct-escape.o librfid.a
$(CC) $(LDFLAGS) -o $@ $^
-librfid.a: rfid_layer2.o rfid_layer2_iso14443a.o rfid_layer2_iso14443b.o rfid_layer2_iso15693.o rfid_asic_rc632.o rfid_reader_cm5121.o rfid.o rfid_protocol.o rfid_proto_tcl.o rfid_proto_mifare_ul.o rfid_proto_mifare_classic.o rfid_iso14443_common.o rfid_reader.o
+librfid.a: $(LIBRFID_OBJS)
ar r $@ $^
%.o: %.c
- $(CC) $(CFLAGS) -o $@ -c $^
+ $(CC) $(CFLAGS) -DHAVE_LIBUSB -DUSE_INTERNAL_CCID_DRIVER -o $@ -c $^
clean:
- rm -f *.o openct-escape
+ rm -f *.o openct-escape librfid.a
struct rfid_asic_transport_handle;
+#include <sys/types.h>
#include <rfid/rfid_asic.h>
struct rfid_asic_rc632_transport {
-
-/*
+/* -*- linux-c -*-
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2
* as published by the Free Software Foundation
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
-#include <openct/openct.h>
#include <rfid/rfid.h>
#include <rfid/rfid_reader.h>
#include <rfid/rfid_reader_cm5121.h>
#include <rfid/rfid_protocol_mifare_classic.h>
-static int slot = 1;
-static ct_handle *h;
-static ct_lock_handle lock;
-
static struct rfid_reader_handle *rh;
static struct rfid_layer2_handle *l2h;
static struct rfid_protocol_handle *ph;
-
-/* this is the sole function required by rfid_reader_cm5121.c */
-int
-PC_to_RDR_Escape(void *handle,
- const unsigned char *tx_buf, unsigned int tx_len,
- unsigned char *rx_buf, unsigned int *rx_len)
-{
- ct_handle *h = (ct_handle *) handle;
- int rc;
-
- rc = ct_card_transact(h, 1, tx_buf, tx_len, rx_buf, *rx_len);
- if (rc >= 0) {
- *rx_len = rc;
- return 0;
- }
-
- return rc;
-}
-
-
-
static int init()
{
unsigned char buf[0x3f];
- unsigned char atr[64];
int rc;
- h = ct_reader_connect(0);
- if (!h)
- return -1;
-
- printf("acquiring card lock\n");
- rc = ct_card_lock(h, slot, IFD_LOCK_EXCLUSIVE, &lock);
- if (rc < 0) {
- fprintf(stderr, "error, no card lock\n");
- return -1;
- }
-
- rc = ct_card_reset(h, slot, atr, sizeof(atr));
- if (rc < 0) {
- fprintf(stderr, "error, can't reset virtual card\n");
- return -1;
- }
-
printf("initializing librfid\n");
rfid_init();
printf("opening reader handle\n");
- rh = rfid_reader_open(h, RFID_READER_CM5121);
+ rh = rfid_reader_open(NULL, RFID_READER_CM5121);
if (!rh) {
fprintf(stderr, "error, no cm5121 handle\n");
return -1;
sleep(2);
printf("opening layer2 handle\n");
- //l2h = rfid_layer2_init(rh, RFID_LAYER2_ISO14443A);
- l2h = rfid_layer2_init(rh, RFID_LAYER2_ISO14443B);
+ l2h = rfid_layer2_init(rh, RFID_LAYER2_ISO14443A);
+ //l2h = rfid_layer2_init(rh, RFID_LAYER2_ISO14443B);
if (!l2h) {
fprintf(stderr, "error during iso14443a_init\n");
return -1;
char buf[0x40];
int i, protocol;
+#if 0
+ if (argc) {
+ argc--;
+ argv++;
+ }
+
+ while (argc) {
+ if ( !strcmp (*argv, "--list")) {
+ char *p;
+ p = ccid_get_reader_list ();
+ if (!p)
+ return 1;
+ fputs (p, stderr);
+ free (p);
+ return 0;
+ }
+ else if ( !strcmp (*argv, "--debug")) {
+ ccid_set_debug_level (ccid_set_debug_level (-1) + 1);
+ argc--; argv++;
+ }
+ else
+ break;
+ }
+#endif
+
if (init() < 0)
exit(1);
/* we've established T=CL at this point */
select_mf();
- //rc632_register_dump(rh->ah, buf);
- //select_mf();
-
iso7816_select_application();
iso7816_select_ef(0x011e);
iso7816_select_ef(0x0101);
mifare_ulight_read(ph);
#if 0
mifare_ulight_blank(ph);
- //mifare_ulight_write(ph);
+ mifare_ulight_write(ph);
mifare_ulight_read(ph);
#endif
break;
printf("key format error\n");
exit(1);
}
- //mfcl_set_key(ph, "xasdfr");
rc = mfcl_auth(ph, RFID_CMD_MIFARE_AUTH1B, 10);
if (rc < 0) {
printf("mifare auth error\n");
memset(rath, 0, sizeof(*rath));
rath->rat = &cm5121_ccid;
- rath->data = data;
-
rh->reader = &rfid_reader_cm5121;
+ if (cm5121_source_init(rath) < 0)
+ goto out_rath;
+
if (cm5121_enable_rc632(rath) < 0)
goto out_rath;
--- /dev/null
+/* CM5121 backend for 'internal' CCID driver */
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
+
+#include <rfid/rfid_asic.h>
+
+#include "ccid/ccid-driver.h"
+
+/* FIXME: remove ugly global variables */
+static ccid_driver_t h;
+
+/* this is the sole function required by rfid_reader_cm5121.c */
+int
+PC_to_RDR_Escape(void *handle,
+ const unsigned char *tx_buf, unsigned int tx_len,
+ unsigned char *rx_buf, unsigned int *rx_len)
+{
+ int rc;
+ ccid_driver_t ch = handle;
+ size_t maxrxlen = *rx_len;
+
+ rc = ccid_transceive_escape (ch, tx_buf, tx_len,
+ rx_buf, maxrxlen, rx_len);
+
+ return rc;
+}
+
+int cm5121_source_init(struct rfid_asic_transport_handle *rath)
+{
+ int rc;
+
+ rc = ccid_open_reader (&h, NULL);
+ if (rc) {
+ fprintf (stderr, "failed to open CCID reader: %#x\n", rc);
+ return -1;
+ }
+ rath->data = &h;
+ return 0;
+}
--- /dev/null
+/* CM5121 backend for OpenCT virtual slot */
+
+#include <stdio.h>
+
+#include <rfid/rfid_asic.h>
+#include <openct/openct.h>
+
+/* FIXME: get rid of this global crap. In fact this needs to become part of
+ * struct rfid_reader_handle */
+static ct_lock_handle lock;
+static int slot = 1;
+
+/* this is the sole function required by rfid_reader_cm5121.c */
+int
+PC_to_RDR_Escape(void *handle,
+ const unsigned char *tx_buf, unsigned int tx_len,
+ unsigned char *rx_buf, unsigned int *rx_len)
+{
+ int rc;
+ ct_handle *h = (ct_handle *) handle;
+
+ rc = ct_card_transact(h, 1, tx_buf, tx_len, rx_buf, *rx_len);
+ if (rc >= 0) {
+ *rx_len = rc;
+ return 0;
+ }
+
+ return rc;
+}
+
+
+int cm5121_source_init(struct rfid_asic_transport_handle *rath)
+{
+ struct ct_handle *h;
+ int rc;
+ unsigned char atr[64];
+
+ h = ct_reader_connect(0);
+ if (!h)
+ return -1;
+
+ printf("acquiring card lock\n");
+ rc = ct_card_lock(h, slot, IFD_LOCK_EXCLUSIVE, &lock);
+ if (rc < 0) {
+ fprintf(stderr, "error, no card lock\n");
+ return -1;
+ }
+
+ rc = ct_card_reset(h, slot, atr, sizeof(atr));
+ if (rc < 0) {
+ fprintf(stderr, "error, can't reset virtual card\n");
+ return -1;
+ }
+
+ rath->data = h;
+
+ return 0;
+}
+
projects / librfid / commitdiff