X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=utils%2Fmifare-tool.c;h=f650355e59202684f2db229ad781aab56851f49e;hb=refs%2Fheads%2Fsmartx;hp=ce16835675fe1feff1374e14b28099149e2e8327;hpb=7f510a35e8c64da454d2bce2fb171791057d79e9;p=librfid

diff --git a/utils/mifare-tool.c b/utils/mifare-tool.c
index ce16835..18c1157 100644
--- a/utils/mifare-tool.c
+++ b/utils/mifare-tool.c
@@ -49,18 +49,20 @@ static void help(void)
 	printf( " -h	--help		Print this help message\n"
 		" -r	--read		Read a mifare sector\n"
 		" -l	--loop-read	Loop reading a mifare sector\n"
+		" -s	--smartx	Read sectors 0-3 (with -k key) and 4-7 with this key\n"
 		" -w	--write		Write a mifare sector\n"
 		" -k	--key		Specify mifare access key (in hex tuples)\n"
-		" -b    --brute-force n	Brute Force read sector n\n");
+		" -b	--brute-force n	Brute Force read sector n\n");
 }
 
 static struct option mifare_opts[] = {
 	{ "key", 1, 0, 'k' },
 	{ "read", 1, 0, 'r' },
+	{ "smartx", 1, 0, 's' },
 	{ "loop-read", 1, 0, 'l' },
 	{ "write", 1 ,0, 'w' },
 	{ "help", 0, 0, 'h' },
-	{ "brute-force", 1, 0, 'c' },
+	{ "brute-force", 1, 0, 'b' },
 	{ 0, 0, 0, 0 }
 };
 
@@ -83,28 +85,24 @@ static int mifare_cl_auth(unsigned char *key, int page)
 	return 0;
 }
 
-static void mifare_l3(void)
+static int mifare_l3(void)
 {
+	int retry;
+
 	while (l2_init(RFID_LAYER2_ISO14443A) < 0) ;
 
 	printf("ISO14443-3A anticollision succeeded\n");
 
-	while (l3_init(RFID_PROTOCOL_MIFARE_CLASSIC) < 0) ;
-
-	printf("Mifare card available\n");
-}
+	retry = 0;
+	while (l3_init(RFID_PROTOCOL_MIFARE_CLASSIC) < 0 && retry++ < 10) ;
 
-static void inc_key(char* key, int len)
-{
-	int i;
-
-	if (len <= 0)
-		return;
-	i = len - 1;
-	if (key[i] < 0xff)
-		key[i]++;
-	else
-		key[i] = 0;
+	if ( retry < 10 ) {
+		printf("Mifare card available\n");
+		return 1;
+	} else {
+		printf("ERROR l3_init\n");
+		return 0;
+	}
 }
 
 int main(int argc, char **argv)
@@ -112,6 +110,7 @@ int main(int argc, char **argv)
 	int len, rc, c, option_index = 0;
 	unsigned int page,uid,uid_len;
 	char key[MIFARE_CL_KEY_LEN];
+	char key2[MIFARE_CL_KEY_LEN];
 	char buf[MIFARE_CL_PAGE_SIZE];
 
 #ifdef  __MINGW32__
@@ -135,14 +134,14 @@ int main(int argc, char **argv)
 	}
 
 	while (1) {
-		c = getopt_long(argc, argv, "k:r:l:w:c:", mifare_opts,
+		c = getopt_long(argc, argv, "k:r:s:l:w:b:h", mifare_opts,
 				&option_index);
 		if (c == -1)
 			break;
 
 		switch (c) {
 			int i;
-		case 'c':
+		case 'b':
 			page = atoi(optarg);
 			printf("key: %s\n", hexdump(key, MIFARE_CL_KEY_LEN));
 			len = MIFARE_CL_PAGE_SIZE;
@@ -163,7 +162,8 @@ int main(int argc, char **argv)
 			printf("read(key='%s',page=%u):",
 				hexdump(key, MIFARE_CL_KEY_LEN), page);
 			len = MIFARE_CL_PAGE_SIZE;
-			mifare_l3();
+			if (! mifare_l3())
+				exit(1);
 			if (mifare_cl_auth(key, page) < 0)
 				exit(1);
 
@@ -200,6 +200,33 @@ int main(int argc, char **argv)
 #endif
 			}
 			break;
+		case 's':
+			hexread(key2, optarg, strlen(optarg));
+			printf("key2: %s\n", hexdump(key2, MIFARE_CL_KEY_LEN));
+			len = MIFARE_CL_PAGE_SIZE;
+			if (! mifare_l3())
+				exit(1);
+			for(page = 0; page < 8; page++) {
+				if (mifare_cl_auth( page < 4 ? key : key2, page) < 0)
+					exit(1);
+
+				if ( page == 0 ) {
+					uid_len=sizeof(uid);
+					uid=0;
+					if(rfid_layer2_getopt(l2h,RFID_OPT_LAYER2_UID,&uid,&uid_len)>=0)
+						printf("UID=%08X (len=%u)\n",uid,uid_len);
+				}
+
+				len=MIFARE_CL_PAGE_SIZE;
+				rc = rfid_protocol_read(ph, page, buf, &len);
+				if (rc < 0) {
+					printf("\n");
+					fprintf(stderr, "error during read\n");
+					break;
+				}
+				printf("page=%d len=%u data=%s\n", page, len, hexdump(buf, len));
+			}
+			break;
 		case 'l':
 			page = atoi(optarg);
 			printf("read_loop(key='%s',page=%u):\n",