]> git.zerfleddert.de Git - proxmark3-svn/commitdiff
ADD: 'hf standalone 14a mode", added "mifare 4k" detection.
authoriceman1001 <iceman@iuse.se>
Wed, 1 Feb 2017 13:41:06 +0000 (14:41 +0100)
committericeman1001 <iceman@iuse.se>
Wed, 1 Feb 2017 13:41:06 +0000 (14:41 +0100)
ADD: 'hf 14a sim' - added mifare 4k simulation.

armsrc/appmain.c
armsrc/iso14443a.c
client/cmdhf14a.c

index 3eac2580d4d43b1455150b1b89f62272d8c72d68..e457f438b3bd716d364ff0554e4e44b6a1cfb667 100644 (file)
@@ -596,21 +596,25 @@ void StandAloneMode14a()
                                                        Dbprintf("Simulating ISO14443a tag with uid: %08x [Bank: %u]", tmpuid & 0xFFFFFFFF , selected);
                                                }
                                                
-                                               if (uids[selected].sak == 8 && uids[selected].atqa[0] == 4 && uids[selected].atqa[1] == 0) {
-                                                       DbpString("Mifare Classic");
-                                                       SimulateIso14443aTag(1, flags, data); // Mifare Classic
-                                               }
-                                               else if (uids[selected].sak == 0 && uids[selected].atqa[0] == 0x44 && uids[selected].atqa[1] == 0) {
+                                               if (uids[selected].sak == 0x08 && uids[selected].atqa[0] == 0x04 && uids[selected].atqa[1] == 0) {
+                                                       DbpString("Mifare Classic 1k");
+                                                       SimulateIso14443aTag(1, flags, data);
+                                               } else if (uids[selected].sak == 0x18 && uids[selected].atqa[0] == 0x02 && uids[selected].atqa[1] == 0) {
+                                                       DbpString("Mifare Classic 4k (4b uid)");
+                                                       SimulateIso14443aTag(8, flags, data);
+                                               } else if (uids[selected].sak == 0x08 && uids[selected].atqa[0] == 0x44 && uids[selected].atqa[1] == 0) {
+                                                       DbpString("Mifare Classic 4k (7b uid)");
+                                                       SimulateIso14443aTag(8, flags, data);
+                                               } else if (uids[selected].sak == 0x00 && uids[selected].atqa[0] == 0x44 && uids[selected].atqa[1] == 0) {
                                                        DbpString("Mifare Ultralight");
-                                                       SimulateIso14443aTag(2, flags, data); // Mifare Ultralight
-                                               }
-                                               else if (uids[selected].sak == 20 && uids[selected].atqa[0] == 0x44 && uids[selected].atqa[1] == 3) {
+                                                       SimulateIso14443aTag(2, flags, data);
+                                               } else if (uids[selected].sak == 0x20 && uids[selected].atqa[0] == 0x04 && uids[selected].atqa[1] == 0x03) {
                                                        DbpString("Mifare DESFire");
-                                                       SimulateIso14443aTag(3, flags, data); // Mifare DESFire
+                                                       SimulateIso14443aTag(3, flags, data);
                                                }
                                                else {
                                                        Dbprintf("Unrecognized tag type -- defaulting to Mifare Classic emulation");
-                                                       SimulateIso14443aTag(1, flags, data); // Mifare Classic
+                                                       SimulateIso14443aTag(1, flags, data);
                                                }
                                        }
                                        else if (button_action == BUTTON_SINGLE_CLICK) {
index 7a08f99908b3f7231492b5a6a3d4d55d5e2913ba..9e860b04dab555582479d617125a9a31fea60f37 100644 (file)
@@ -918,7 +918,11 @@ void SimulateIso14443aTag(int tagType, int flags, byte_t* data) {
                                memcpy(data+3, emdata+4, 4); // uid bytes 3-7
                                flags |= FLAG_7B_UID_IN_DATA;
                        }
-               } break;                
+               } break;        
+               case 8: { // MIFARE Classic 4k
+                       response1[0] = 0x02;
+                       sak = 0x18;
+               } break;
                default: {
                        Dbprintf("Error: unkown tagtype (%d)",tagType);
                        return;
index b6c8b3c93f245b56f90f8a9a351808424851e29f..f4f40fc3f84c3624b1c2780478cbcfb0f506bd65 100644 (file)
@@ -133,13 +133,14 @@ int usage_hf_14a_sim(void) {
        PrintAndLog("usage: hf 14a sim [h] t <type> u <uid> [x] [e] [v]");
        PrintAndLog("options: ");
        PrintAndLog("    h     : This help");
-       PrintAndLog("    t     : 1 = MIFARE Classic");
+       PrintAndLog("    t     : 1 = MIFARE Classic 1k");
        PrintAndLog("            2 = MIFARE Ultralight");
        PrintAndLog("            3 = MIFARE Desfire");
        PrintAndLog("            4 = ISO/IEC 14443-4");
        PrintAndLog("            5 = MIFARE Tnp3xxx");
        PrintAndLog("            6 = MIFARE Mini");
        PrintAndLog("            7 = AMIIBO (NTAG 215),  pack 0x8080");
+       PrintAndLog("            8 = MIFARE Classic 4k");
 //     PrintAndLog("    u     : 4, 7 or 10 byte UID");
        PrintAndLog("    u     : 4, 7 byte UID");
        PrintAndLog("    x     : (Optional) Performs the 'reader attack', nr/ar attack against a reader");
Impressum, Datenschutz