X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=utils%2Flibrfid-tool.c;h=eae90252832e077e5af37258b38c7c9138da510c;hb=db516767b83404ba51985eee39a8d24ab6e7ecb0;hp=74f6128a4c695a80a34871e8bce72ef79029ab0c;hpb=04d32adf9f8c047a5fdd150814adaa0967728937;p=librfid

diff --git a/utils/librfid-tool.c b/utils/librfid-tool.c
index 74f6128..eae9025 100644
--- a/utils/librfid-tool.c
+++ b/utils/librfid-tool.c
@@ -1,6 +1,6 @@
 /* librfid-tool - a small command-line tool for librfid testing
  *
- * (C) 2005-2006 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2005-2008 by Harald Welte <laforge@gnumonks.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 
@@ -35,8 +35,14 @@
 #include <librfid/rfid_layer2.h>
 #include <librfid/rfid_protocol.h>
 
+#include <librfid/rfid_layer2_iso14443a.h>
+#include <librfid/rfid_layer2_iso15693.h>
+
 #include <librfid/rfid_protocol_mifare_classic.h>
 #include <librfid/rfid_protocol_mifare_ul.h>
+#include <librfid/rfid_protocol_tagit.h>
+#include <librfid/rfid_protocol_icode.h>
+#include <librfid/rfid_protocol_tcl.h>
 
 #include "librfid-tool.h"
 
@@ -202,15 +208,21 @@ mifare_classic_read_sector(struct rfid_protocol_handle *ph, int sector)
 	unsigned char buf[20];
 	unsigned int len = sizeof(buf);
 	int ret;
-	int block;
+	int block, blocks_per_sector, first_block;
 
-	/* FIXME: make this work for sectors > 31 */
 	printf("Reading sector %u\n", sector);
 
-	for (block = sector*4; block < sector*4+4; block++) {
+	first_block = mfcl_sector2block(sector);
+	blocks_per_sector = mfcl_sector_blocks(sector);
+
+	if (first_block < 0 || blocks_per_sector < 0)
+		return -EINVAL;
+
+	for (block = first_block; block < first_block + blocks_per_sector;
+	     block++) {
 		printf("Reading block %u: ", block);
 		ret = rfid_protocol_read(ph, block, buf, &len);
-		if(ret == -ETIMEDOUT)
+		if (ret == -ETIMEDOUT)
 			fprintf(stderr, "TIMEOUT\n");
 		if (ret < 0) {
 			printf("Error %d reading\n", ret);
@@ -222,10 +234,65 @@ mifare_classic_read_sector(struct rfid_protocol_handle *ph, int sector)
 	return 0;
 }
 
+static int
+mifare_classic_dump(struct rfid_protocol_handle *ph)
+{
+	unsigned int size;
+	unsigned int size_len = sizeof(size);
+	int sector, num_sectors;
+
+	if (rfid_protocol_getopt(ph, RFID_OPT_PROTO_SIZE, 
+				 &size, &size_len) == 0) {
+		printf("Size: %u bytes\n", size);
+	} else {
+		printf("Size: unknown ?!?\n");
+		return -EINVAL;
+	}
+
+	switch (size) {
+	case 320:
+		num_sectors = 5;
+		break;
+	case 1024:
+		num_sectors = 16;
+		break;
+	case 4096:
+		num_sectors = 40;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	for (sector = 0; sector < num_sectors; sector++) {
+		int rc;
+
+		printf("Authenticating sector %u: ", sector);
+		fflush(stdout);
+
+		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,
+			       mfcl_sector2block(sector));
+		if (rc < 0) {
+			printf("mifare auth error\n");
+			exit(1);
+		} else 
+			printf("mifare auth succeeded!\n");
+
+		mifare_classic_read_sector(ph, sector);
+	}
+}
+
 static char *proto_names[] = {
 	[RFID_PROTOCOL_TCL] = "tcl",
 	[RFID_PROTOCOL_MIFARE_UL] = "mifare-ultralight",
 	[RFID_PROTOCOL_MIFARE_CLASSIC] = "mifare-classic",
+	[RFID_PROTOCOL_ICODE_SLI] = "icode",
+	[RFID_PROTOCOL_TAGIT] = "tagit",
 };
 
 static int proto_by_name(const char *name)
@@ -245,6 +312,7 @@ static char *l2_names[] = {
 	[RFID_LAYER2_ISO14443A] = "iso14443a",
 	[RFID_LAYER2_ISO14443B] = "iso14443b",
 	[RFID_LAYER2_ISO15693] = "iso15693",
+	[RFID_LAYER2_ICODE1] = "icode1",
 };
 
 static int l2_by_name(const char *name)
@@ -260,12 +328,28 @@ static int l2_by_name(const char *name)
 	return -1;
 }
 
-static void do_scan(void)
+static int do_scan(int first)
 {
 	int rc;
 	unsigned int size;
 	unsigned int size_len = sizeof(size);
+	char *data;
+	unsigned int data_len;
 
+	if (first) {
+		unsigned int opt;
+		unsigned int optlen = sizeof(opt);
+
+		/* turn off RF */
+		opt = 1;
+		rfid_reader_setopt(rh, RFID_OPT_RDR_RF_KILL, &opt, optlen);
+
+		usleep(10*1000);
+
+		/* turn on RF */
+		opt = 0;
+		rfid_reader_setopt(rh, RFID_OPT_RDR_RF_KILL, &opt, optlen);
+	}
 	printf("scanning for RFID token...\n");
 	rc = rfid_scan(rh, &l2h, &ph);
 	if (rc >= 2) {
@@ -282,6 +366,125 @@ static void do_scan(void)
 		if (rfid_protocol_getopt(ph, RFID_OPT_PROTO_SIZE, 
 					 &size, &size_len) == 0)
 			printf("Size: %u bytes\n", size);
+		size_len = sizeof(size);
+		size = 0;
+		if (rfid_protocol_getopt(ph, RFID_OPT_P_TCL_ATS_LEN,
+					 &size, &size_len) == 0) {
+			data_len = size + 1;
+			data = malloc(data_len);
+			if (data) {
+				if (rfid_protocol_getopt(ph, RFID_OPT_P_TCL_ATS,
+							 data, &data_len) == 0) {
+					printf("Got ATS of %u bytes: %s\n", size,
+					       hexdump(data, data_len));
+				}
+			}
+		}
+	}
+
+	return rc;
+}
+
+static void do_endless_scan()
+{
+	int rc;
+	int first = 1;
+
+	while (1) {
+		if (first)
+			putc('\n', stdout);
+		printf("==> doing %s scan\n", first ? "first" : "successive");
+		rc = do_scan(first);
+		if (rc >= 3) {
+			printf("closing proto\n");
+			rfid_protocol_close(ph);
+		}
+		if (rc >= 2) {
+			printf("closing layer2\n");
+			rfid_layer2_close(l2h);
+			first = 0;
+		} else
+			first = 1;
+	}
+}
+
+static void do_regdump(void)
+{
+	u_int8_t buffer[0xff];
+	int i;
+
+	printf("dumping rc632 regs...\n");
+
+	rc632_register_dump(rh->ah, buffer);
+
+	printf("\n     ");
+	for (i=0; i<=0x0f; i++)
+		printf(" 0x_%01X",i);
+	printf("\n-----------------------------------------------------------------------------------\n");
+
+	for (i=0; i <= 0x3f; i++) {
+		if ((i % 0x10) == 0)
+			printf("0x%01X_:",i/0x10);
+		printf(" 0x%02X", buffer[i]);
+		if ((i% 0x10) == 0x0f)
+			printf("\n");
+	}
+
+	/* print regdump as c-style array*/
+	printf("u_int8_t rc632_regs[] = {");
+	for (i = 0; i <= 0x3f; i++) {
+		if (((i+1) % 0x08) == 1) {
+			if (i > 7)
+				printf("//%2d..%2d",i-8,i-1);
+			printf("\n\t");
+		}
+		printf(" 0x%02X, ",buffer[i]);
+	}
+	printf("//%2d..%2d\n\t 0 };\n",i-8,i-1);
+
+}
+
+static void do_enum(int layer2)
+{
+	int rc;
+	//unsigned int size;
+	//unsigned int size_len = sizeof(size);
+	unsigned char uid_buf[16];
+	unsigned int uid_len;
+
+	printf("scanning for RFID token on layer %s...\n", l2_names[layer2]);
+
+	if (rh->reader->l2_supported & (1 << layer2)) {
+		l2h = rfid_layer2_init(rh, layer2);
+		rc = rfid_layer2_open(l2h);
+	} else {
+		printf("error during layer2_open\n");
+		return ;
+	}
+
+	while (rc>=0) {
+		if (l2h) {
+			uid_len = sizeof(uid_buf);
+			rfid_layer2_getopt(l2h, RFID_OPT_LAYER2_UID, &uid_buf, &uid_len);
+			printf("Layer 2 success (%s)[%d]: %s\n", rfid_layer2_name(l2h), uid_len, hexdump(uid_buf, uid_len));
+		}
+
+       	/*
+		ph = rfid_protocol_scan(l2h);
+		if (ph) {
+			printf("Protocol success (%s)\n", rfid_protocol_name(ph));
+
+			if (rfid_protocol_getopt(ph, RFID_OPT_PROTO_SIZE,
+					     &size, &size_len) == 0)
+			printf("Size: %u bytes\n", size);
+		} else
+			printf("##############\n");
+		*/
+
+		if (rc >= 0) {
+			rfid_layer2_close(l2h);
+		}
+		rc = rfid_layer2_open(l2h);
 	}
 }
 
@@ -293,6 +496,8 @@ static struct option original_opts[] = {
 	{ "protocol", 1, 0, 'p' },
 	{ "scan", 0, 0, 's' },
 	{ "scan-loop", 0, 0, 'S' },
+	{ "dump", 0, 0, 'd' },
+	{ "enum", 0, 0, 'e' },
 	{0, 0, 0, 0}
 };
 
@@ -365,8 +570,10 @@ static void help(void)
 {
 	printf( " -s	--scan		scan until first RFID tag is found\n"
 		" -S	--scan-loop	endless scanning loop\n" 
-		" -p	--protocol	{tcl,mifare-ultralight,mifare-classic}\n"
+		" -p	--protocol	{tcl,mifare-ultralight,mifare-classic,tagit}\n"
 		" -l	--layer2	{iso14443a,iso14443b,iso15693}\n"
+		" -d	--dump		dump rc632 registers\n"
+		" -e	--enum		enumerate all tag's in field (iso14443a)\n"
 		" -h	--help\n");
 }
 
@@ -382,7 +589,7 @@ int main(int argc, char **argv)
 	program_name = basename(argv[0]);
 #endif/*__MINGW32__*/
 	
-	printf("%s - (C) 2006 by Harald Welte\n"
+	printf("%s - (C) 2005-2008 by Harald Welte\n"
 	       "This program is Free Software and has "
 	       "ABSOLUTELY NO WARRANTY\n\n", program_name);
 
@@ -391,22 +598,33 @@ int main(int argc, char **argv)
 
 	while (1) {
 		int c, option_index = 0;
-		c = getopt_long(argc, argv, "hp:l:sS", opts, &option_index);
+		c = getopt_long(argc, argv, "hp:l:sSde", opts, &option_index);
 		if (c == -1)
 			break;
 
 		switch (c) {
+		case 'e':
+			if (reader_init() < 0)
+				exit(1);
+			layer2 = RFID_LAYER2_ISO14443A;
+			do_enum(layer2);
+			exit(0);
+			break;
+		case 'd':
+			if (reader_init() < 0)
+				exit(1);
+			do_regdump();
+			break;
 		case 's':
 			if (reader_init() < 0)
 				exit(1);
-			do_scan();
+			do_scan(0);
 			exit(0);
 			break;
 		case 'S':
 			if (reader_init() < 0)
 				exit(1);
-			while (1) 
-				do_scan();
+			do_endless_scan();
 			exit(0);
 			break;
 		case 'p':
@@ -450,11 +668,16 @@ int main(int argc, char **argv)
 	if (reader_init() < 0)
 		exit(1);
 
-	if (l2_init(layer2) < 0)
+
+	if (l2_init(layer2) < 0) {
+		rfid_reader_close(rh);
 		exit(1);
+	}
 
-	if (l3_init(protocol) < 0)
+	if (l3_init(protocol) < 0) {
+		rfid_reader_close(rh);
 		exit(1);
+	}
 
 	switch (protocol) {
 
@@ -522,29 +745,10 @@ int main(int argc, char **argv)
 		break;
 	case RFID_PROTOCOL_MIFARE_CLASSIC:
 		printf("Protocol Mifare Classic\n");
-		{
-			int sector;
-			for (sector = 0; sector < 31; sector++) {
-				printf("Authenticating sector %u: ", sector);
-				fflush(stdout);
-				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*4);
-				if (rc < 0) {
-					printf("mifare auth error\n");
-					exit(1);
-				} else 
-					printf("mifare auth succeeded!\n");
-
-				mifare_classic_read_sector(ph, sector);
-			}
-		}
+		mifare_classic_dump(ph);
 		break;
 	default:
-		printf("unknown protocol\n");
+		printf("unknown protocol %u\n", protocol);
 		exit(1);
 		break;
 	}