rename openct-escape into librfid-tool
authorHarald Welte <laforge@gnumonks.org>
Sat, 27 May 2006 16:55:12 +0000 (16:55 +0000)
committerHarald Welte <laforge@gnumonks.org>
Sat, 27 May 2006 16:55:12 +0000 (16:55 +0000)
git-svn-id: https://svn.gnumonks.org/trunk/librfid@1800 e0336214-984f-0b4b-a45f-81c69e1f0ede

utils/Makefile.am
utils/librfid-tool.c [new file with mode: 0644]
utils/openct-escape.c [deleted file]

index cddde17..fff8e6a 100644 (file)
@@ -1,8 +1,8 @@
 INCLUDES = $(all_includes) -I$(top_srcdir)/include
 
-bin_PROGRAMS = openct-escape
+bin_PROGRAMS = librfid-tool
 
-openct_escape_SOURCES = openct-escape.c
+openct_escape_SOURCES = librfid-tool.c
 openct_escape_LDADD = ../src/librfid.la
 openct_escape_LDFLAGS = -dynamic
 
diff --git a/utils/librfid-tool.c b/utils/librfid-tool.c
new file mode 100644 (file)
index 0000000..3c0de34
--- /dev/null
@@ -0,0 +1,379 @@
+/*                                                 -*- 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
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <librfid/rfid.h>
+#include <librfid/rfid_reader.h>
+#include <librfid/rfid_layer2.h>
+#include <librfid/rfid_protocol.h>
+
+#include <librfid/rfid_protocol_mifare_classic.h>
+#include <librfid/rfid_protocol_mifare_ul.h>
+
+static const char *
+hexdump(const void *data, unsigned int len)
+{
+       static char string[1024];
+       unsigned char *d = (unsigned char *) data;
+       unsigned int i, left;
+
+       string[0] = '\0';
+       left = sizeof(string);
+       for (i = 0; len--; i += 3) {
+               if (i >= sizeof(string) -4)
+                       break;
+               snprintf(string+i, 4, " %02x", *d++);
+       }
+       return string;
+}
+
+static struct rfid_reader_handle *rh;
+static struct rfid_layer2_handle *l2h;
+static struct rfid_protocol_handle *ph;
+
+static int init()
+{
+       unsigned char buf[0x3f];
+       int rc;
+
+       printf("initializing librfid\n");
+       rfid_init();
+
+       printf("opening reader handle\n");
+       rh = rfid_reader_open(NULL, RFID_READER_CM5121);
+       if (!rh) {
+               fprintf(stderr, "error, no cm5121 handle\n");
+               return -1;
+       }
+
+       printf("opening layer2 handle\n");
+       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;
+       }
+
+       //rc632_register_dump(rh->ah, buf);
+
+       printf("running layer2 anticol\n");
+       rc = rfid_layer2_open(l2h);
+       if (rc < 0) {
+               fprintf(stderr, "error during layer2_open\n");
+               return rc;
+       }
+
+       return 0;
+}
+
+static int l3(int protocol)
+{
+       printf("running layer3 (ats)\n");
+       ph = rfid_protocol_init(l2h, protocol);
+       if (!ph) {
+               fprintf(stderr, "error during protocol_init\n");
+               return -1;
+       }
+       if (rfid_protocol_open(ph) < 0) {
+               fprintf(stderr, "error during protocol_open\n");
+               return -1;
+       }
+
+       printf("we now have layer3 up and running\n");
+
+       return 0;
+}
+
+static int select_mf(void)
+{
+       unsigned char cmd[] = { 0x00, 0xa4, 0x00, 0x00, 0x02, 0x3f, 0x00, 0x00 };
+       unsigned char ret[256];
+       unsigned int rlen = sizeof(ret);
+
+       int rv;
+
+       rv = rfid_protocol_transcieve(ph, cmd, sizeof(cmd), ret, &rlen, 0, 0);
+       if (rv < 0)
+               return rv;
+
+       printf("%d: [%s]\n", rlen, hexdump(ret, rlen));
+
+       return 0;
+}
+
+
+static int iso7816_get_challenge(unsigned char len)
+{
+       unsigned char cmd[] = { 0x00, 0x84, 0x00, 0x00, 0x08 };
+       unsigned char ret[256];
+       unsigned int rlen = sizeof(ret);
+
+       cmd[4] = len;
+
+       int rv;
+
+       rv = rfid_protocol_transcieve(ph, cmd, sizeof(cmd), ret, &rlen, 0, 0);
+       if (rv < 0)
+               return rv;
+
+       printf("%d: [%s]\n", rlen, hexdump(ret, rlen));
+
+       return 0;
+}
+
+int
+iso7816_select_application(void)
+{
+       unsigned char cmd[] = { 0x00, 0xa4, 0x04, 0x0c, 0x07,
+                      0xa0, 0x00, 0x00, 0x02, 0x47, 0x10, 0x01 };
+       unsigned char resp[7];
+       unsigned int rlen = sizeof(resp);
+
+       int rv;
+
+       rv = rfid_protocol_transcieve(ph, cmd, sizeof(cmd), resp, &rlen, 0, 0);
+       if (rv < 0)
+               return rv;
+
+       /* FIXME: parse response */
+       printf("%s\n", hexdump(resp, rlen));
+
+       return 0;
+}
+
+int
+iso7816_select_ef(u_int16_t fid)
+{
+       unsigned char cmd[7] = { 0x00, 0xa4, 0x02, 0x0c, 0x02, 0x00, 0x00 };
+       unsigned char resp[7];
+       unsigned int rlen = sizeof(resp);
+
+       int rv;
+
+       cmd[5] = (fid >> 8) & 0xff;
+       cmd[6] = fid & 0xff;
+
+       rv = rfid_protocol_transcieve(ph, cmd, sizeof(cmd), resp, &rlen, 0, 0);
+       if (rv < 0)
+               return rv;
+
+       /* FIXME: parse response */
+       printf("%s\n", hexdump(resp, rlen));
+
+       return 0;
+}
+
+int
+iso7816_read_binary(unsigned char *buf, unsigned int *len)
+{
+       unsigned char cmd[] = { 0x00, 0xb0, 0x00, 0x00, 0x00 };
+       unsigned char resp[256];
+       unsigned int rlen = sizeof(resp);
+       
+       int rv;
+
+       rv = rfid_protocol_transcieve(ph, cmd, sizeof(cmd), resp, &rlen, 0, 0);
+       if (rv < 0)
+               return rv;
+
+       printf("%s\n", hexdump(resp, rlen));
+
+       /* FIXME: parse response, determine whether we need additional reads */
+
+       /* FIXME: copy 'len' number of response bytes to 'buf' */
+       return 0;
+}
+
+/* wrapper function around SELECT EF and READ BINARY */
+int
+iso7816_read_ef(u_int16_t fid, unsigned char *buf, unsigned int *len)
+{
+       int rv;
+
+       rv = iso7816_select_ef(fid);
+       if (rv < 0)
+               return rv;
+
+       return iso7816_read_binary(buf, len);
+}
+
+/* mifare ultralight helpers */
+int
+mifare_ulight_write(struct rfid_protocol_handle *ph)
+{
+       unsigned char buf[4] = { 0xa1, 0xa2, 0xa3, 0xa4 };
+
+       return rfid_protocol_write(ph, 10, buf, 4);
+}
+
+int
+mifare_ulight_blank(struct rfid_protocol_handle *ph)
+{
+       unsigned char buf[4] = { 0x00, 0x00, 0x00, 0x00 };
+       int i, ret;
+
+       for (i = 4; i <= MIFARE_UL_PAGE_MAX; i++) {
+               ret = rfid_protocol_write(ph, i, buf, 4);
+               if (ret < 0)
+                       return ret;
+       }
+       return 0;
+}
+
+static int
+mifare_ulight_read(struct rfid_protocol_handle *ph)
+{
+       unsigned char buf[20];
+       unsigned int len = sizeof(buf);
+       int ret;
+       int i;
+
+       for (i = 0; i <= MIFARE_UL_PAGE_MAX; i++) {
+               ret = rfid_protocol_read(ph, i, buf, &len);
+               if (ret < 0)
+                       return ret;
+
+               printf("Page 0x%x: %s\n", i, hexdump(buf, 4));
+       }
+       return 0;
+}
+
+/* mifare classic helpers */
+static int
+mifare_classic_read_sector(struct rfid_protocol_handle *ph, int sector)
+{
+       unsigned char buf[20];
+       unsigned int len = sizeof(buf);
+       int ret;
+       int block;
+
+       /* FIXME: make this work for sectors > 31 */
+       printf("reading sector %u\n", sector);
+
+       for (block = sector*4; block < sector*4+4; block++) {
+               printf("reading block %u\n", block);
+               ret = rfid_protocol_read(ph, block, buf, &len);
+               if (ret < 0)
+                       return ret;
+
+               printf("Page 0x%x: %s\n", block, hexdump(buf, len));
+       }
+       return 0;
+}
+
+
+int main(int argc, char **argv)
+{
+       int rc;
+       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);
+
+       //while(1) { }
+
+       //protocol = RFID_PROTOCOL_MIFARE_UL;
+       //protocol = RFID_PROTOCOL_MIFARE_CLASSIC;
+       protocol = RFID_PROTOCOL_TCL;
+
+       if (l3(protocol) < 0)
+               exit(1);
+
+       switch (protocol) {
+               char buf[32000];
+               int len = 200;
+
+       case RFID_PROTOCOL_TCL:
+               /* we've established T=CL at this point */
+               select_mf();
+
+               iso7816_select_application();
+               iso7816_select_ef(0x011e);
+               iso7816_select_ef(0x0101);
+
+               while (1) {
+                       len = 200;
+                       printf("reading ef\n");
+                       iso7816_read_binary(buf, &len);
+               }
+#if 0
+               for (i = 0; i < 4; i++)
+                       iso7816_get_challenge(0xff);
+#endif
+               break;
+       case RFID_PROTOCOL_MIFARE_UL:
+               mifare_ulight_read(ph);
+#if 0
+               mifare_ulight_blank(ph);
+               mifare_ulight_write(ph);
+               mifare_ulight_read(ph);
+#endif
+               break;
+       case RFID_PROTOCOL_MIFARE_CLASSIC:
+               {
+                       int sector;
+                       for (sector = 1; sector < 31; sector++) {
+                               rc = mfcl_set_key(ph, MIFARE_CL_KEYA_DEFAULT_INFINEON);
+                               if (rc < 0) {
+                                       printf("key format error\n");
+                                       exit(1);
+                               }
+                               rc = mfcl_auth(ph, RFID_CMD_MIFARE_AUTH1A, sector);
+                               if (rc < 0) {
+                                       printf("mifare auth error\n");
+                                       exit(1);
+                               } else 
+                                       printf("mifare authe succeeded!\n");
+
+                               mifare_classic_read_sector(ph, sector);
+                       }
+               }
+               break;
+       }
+
+       rfid_reader_close(rh);
+       
+       exit(0);
+}
diff --git a/utils/openct-escape.c b/utils/openct-escape.c
deleted file mode 100644 (file)
index 3c0de34..0000000
+++ /dev/null
@@ -1,379 +0,0 @@
-/*                                                 -*- 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
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <librfid/rfid.h>
-#include <librfid/rfid_reader.h>
-#include <librfid/rfid_layer2.h>
-#include <librfid/rfid_protocol.h>
-
-#include <librfid/rfid_protocol_mifare_classic.h>
-#include <librfid/rfid_protocol_mifare_ul.h>
-
-static const char *
-hexdump(const void *data, unsigned int len)
-{
-       static char string[1024];
-       unsigned char *d = (unsigned char *) data;
-       unsigned int i, left;
-
-       string[0] = '\0';
-       left = sizeof(string);
-       for (i = 0; len--; i += 3) {
-               if (i >= sizeof(string) -4)
-                       break;
-               snprintf(string+i, 4, " %02x", *d++);
-       }
-       return string;
-}
-
-static struct rfid_reader_handle *rh;
-static struct rfid_layer2_handle *l2h;
-static struct rfid_protocol_handle *ph;
-
-static int init()
-{
-       unsigned char buf[0x3f];
-       int rc;
-
-       printf("initializing librfid\n");
-       rfid_init();
-
-       printf("opening reader handle\n");
-       rh = rfid_reader_open(NULL, RFID_READER_CM5121);
-       if (!rh) {
-               fprintf(stderr, "error, no cm5121 handle\n");
-               return -1;
-       }
-
-       printf("opening layer2 handle\n");
-       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;
-       }
-
-       //rc632_register_dump(rh->ah, buf);
-
-       printf("running layer2 anticol\n");
-       rc = rfid_layer2_open(l2h);
-       if (rc < 0) {
-               fprintf(stderr, "error during layer2_open\n");
-               return rc;
-       }
-
-       return 0;
-}
-
-static int l3(int protocol)
-{
-       printf("running layer3 (ats)\n");
-       ph = rfid_protocol_init(l2h, protocol);
-       if (!ph) {
-               fprintf(stderr, "error during protocol_init\n");
-               return -1;
-       }
-       if (rfid_protocol_open(ph) < 0) {
-               fprintf(stderr, "error during protocol_open\n");
-               return -1;
-       }
-
-       printf("we now have layer3 up and running\n");
-
-       return 0;
-}
-
-static int select_mf(void)
-{
-       unsigned char cmd[] = { 0x00, 0xa4, 0x00, 0x00, 0x02, 0x3f, 0x00, 0x00 };
-       unsigned char ret[256];
-       unsigned int rlen = sizeof(ret);
-
-       int rv;
-
-       rv = rfid_protocol_transcieve(ph, cmd, sizeof(cmd), ret, &rlen, 0, 0);
-       if (rv < 0)
-               return rv;
-
-       printf("%d: [%s]\n", rlen, hexdump(ret, rlen));
-
-       return 0;
-}
-
-
-static int iso7816_get_challenge(unsigned char len)
-{
-       unsigned char cmd[] = { 0x00, 0x84, 0x00, 0x00, 0x08 };
-       unsigned char ret[256];
-       unsigned int rlen = sizeof(ret);
-
-       cmd[4] = len;
-
-       int rv;
-
-       rv = rfid_protocol_transcieve(ph, cmd, sizeof(cmd), ret, &rlen, 0, 0);
-       if (rv < 0)
-               return rv;
-
-       printf("%d: [%s]\n", rlen, hexdump(ret, rlen));
-
-       return 0;
-}
-
-int
-iso7816_select_application(void)
-{
-       unsigned char cmd[] = { 0x00, 0xa4, 0x04, 0x0c, 0x07,
-                      0xa0, 0x00, 0x00, 0x02, 0x47, 0x10, 0x01 };
-       unsigned char resp[7];
-       unsigned int rlen = sizeof(resp);
-
-       int rv;
-
-       rv = rfid_protocol_transcieve(ph, cmd, sizeof(cmd), resp, &rlen, 0, 0);
-       if (rv < 0)
-               return rv;
-
-       /* FIXME: parse response */
-       printf("%s\n", hexdump(resp, rlen));
-
-       return 0;
-}
-
-int
-iso7816_select_ef(u_int16_t fid)
-{
-       unsigned char cmd[7] = { 0x00, 0xa4, 0x02, 0x0c, 0x02, 0x00, 0x00 };
-       unsigned char resp[7];
-       unsigned int rlen = sizeof(resp);
-
-       int rv;
-
-       cmd[5] = (fid >> 8) & 0xff;
-       cmd[6] = fid & 0xff;
-
-       rv = rfid_protocol_transcieve(ph, cmd, sizeof(cmd), resp, &rlen, 0, 0);
-       if (rv < 0)
-               return rv;
-
-       /* FIXME: parse response */
-       printf("%s\n", hexdump(resp, rlen));
-
-       return 0;
-}
-
-int
-iso7816_read_binary(unsigned char *buf, unsigned int *len)
-{
-       unsigned char cmd[] = { 0x00, 0xb0, 0x00, 0x00, 0x00 };
-       unsigned char resp[256];
-       unsigned int rlen = sizeof(resp);
-       
-       int rv;
-
-       rv = rfid_protocol_transcieve(ph, cmd, sizeof(cmd), resp, &rlen, 0, 0);
-       if (rv < 0)
-               return rv;
-
-       printf("%s\n", hexdump(resp, rlen));
-
-       /* FIXME: parse response, determine whether we need additional reads */
-
-       /* FIXME: copy 'len' number of response bytes to 'buf' */
-       return 0;
-}
-
-/* wrapper function around SELECT EF and READ BINARY */
-int
-iso7816_read_ef(u_int16_t fid, unsigned char *buf, unsigned int *len)
-{
-       int rv;
-
-       rv = iso7816_select_ef(fid);
-       if (rv < 0)
-               return rv;
-
-       return iso7816_read_binary(buf, len);
-}
-
-/* mifare ultralight helpers */
-int
-mifare_ulight_write(struct rfid_protocol_handle *ph)
-{
-       unsigned char buf[4] = { 0xa1, 0xa2, 0xa3, 0xa4 };
-
-       return rfid_protocol_write(ph, 10, buf, 4);
-}
-
-int
-mifare_ulight_blank(struct rfid_protocol_handle *ph)
-{
-       unsigned char buf[4] = { 0x00, 0x00, 0x00, 0x00 };
-       int i, ret;
-
-       for (i = 4; i <= MIFARE_UL_PAGE_MAX; i++) {
-               ret = rfid_protocol_write(ph, i, buf, 4);
-               if (ret < 0)
-                       return ret;
-       }
-       return 0;
-}
-
-static int
-mifare_ulight_read(struct rfid_protocol_handle *ph)
-{
-       unsigned char buf[20];
-       unsigned int len = sizeof(buf);
-       int ret;
-       int i;
-
-       for (i = 0; i <= MIFARE_UL_PAGE_MAX; i++) {
-               ret = rfid_protocol_read(ph, i, buf, &len);
-               if (ret < 0)
-                       return ret;
-
-               printf("Page 0x%x: %s\n", i, hexdump(buf, 4));
-       }
-       return 0;
-}
-
-/* mifare classic helpers */
-static int
-mifare_classic_read_sector(struct rfid_protocol_handle *ph, int sector)
-{
-       unsigned char buf[20];
-       unsigned int len = sizeof(buf);
-       int ret;
-       int block;
-
-       /* FIXME: make this work for sectors > 31 */
-       printf("reading sector %u\n", sector);
-
-       for (block = sector*4; block < sector*4+4; block++) {
-               printf("reading block %u\n", block);
-               ret = rfid_protocol_read(ph, block, buf, &len);
-               if (ret < 0)
-                       return ret;
-
-               printf("Page 0x%x: %s\n", block, hexdump(buf, len));
-       }
-       return 0;
-}
-
-
-int main(int argc, char **argv)
-{
-       int rc;
-       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);
-
-       //while(1) { }
-
-       //protocol = RFID_PROTOCOL_MIFARE_UL;
-       //protocol = RFID_PROTOCOL_MIFARE_CLASSIC;
-       protocol = RFID_PROTOCOL_TCL;
-
-       if (l3(protocol) < 0)
-               exit(1);
-
-       switch (protocol) {
-               char buf[32000];
-               int len = 200;
-
-       case RFID_PROTOCOL_TCL:
-               /* we've established T=CL at this point */
-               select_mf();
-
-               iso7816_select_application();
-               iso7816_select_ef(0x011e);
-               iso7816_select_ef(0x0101);
-
-               while (1) {
-                       len = 200;
-                       printf("reading ef\n");
-                       iso7816_read_binary(buf, &len);
-               }
-#if 0
-               for (i = 0; i < 4; i++)
-                       iso7816_get_challenge(0xff);
-#endif
-               break;
-       case RFID_PROTOCOL_MIFARE_UL:
-               mifare_ulight_read(ph);
-#if 0
-               mifare_ulight_blank(ph);
-               mifare_ulight_write(ph);
-               mifare_ulight_read(ph);
-#endif
-               break;
-       case RFID_PROTOCOL_MIFARE_CLASSIC:
-               {
-                       int sector;
-                       for (sector = 1; sector < 31; sector++) {
-                               rc = mfcl_set_key(ph, MIFARE_CL_KEYA_DEFAULT_INFINEON);
-                               if (rc < 0) {
-                                       printf("key format error\n");
-                                       exit(1);
-                               }
-                               rc = mfcl_auth(ph, RFID_CMD_MIFARE_AUTH1A, sector);
-                               if (rc < 0) {
-                                       printf("mifare auth error\n");
-                                       exit(1);
-                               } else 
-                                       printf("mifare authe succeeded!\n");
-
-                               mifare_classic_read_sector(ph, sector);
-                       }
-               }
-               break;
-       }
-
-       rfid_reader_close(rh);
-       
-       exit(0);
-}