]> git.zerfleddert.de Git - proxmark3-svn/commitdiff
Merge pull request #133 from marshmellow42/master
authorMartin Holst Swende <martin@swende.se>
Mon, 20 Jul 2015 22:27:09 +0000 (00:27 +0200)
committerMartin Holst Swende <martin@swende.se>
Mon, 20 Jul 2015 22:27:09 +0000 (00:27 +0200)
14b additions + some bug fixes

armsrc/appmain.c

index ddfe001c27dc97966eb27cf077a13eac52762e88..7aa353b2404a7401f57d1b216ee9f256e760ee34 100644 (file)
@@ -298,19 +298,13 @@ void SendVersion(void)
        cmd_send(CMD_ACK, *(AT91C_DBGU_CIDR), text_and_rodata_section_size + compressed_data_section_size, 0, VersionString, strlen(VersionString));
 }
 
-#ifdef WITH_LF
-#ifndef WITH_ISO14443a_StandAlone
-// samy's sniff and repeat routine
-void SamyRun()
-{
-       DbpString("Stand-alone mode! No PC necessary.");
-       FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+#if defined(WITH_ISO14443a_StandAlone) || defined(WITH_LF)
 
-       // 3 possible options? no just 2 for now
 #define OPTS 2
 
-       int high[OPTS], low[OPTS];
-
+void StandAloneMode()
+{
+       DbpString("Stand-alone mode! No PC necessary.");
        // Oooh pretty -- notify user we're in elite samy mode now
        LED(LED_RED,    200);
        LED(LED_ORANGE, 200);
@@ -322,41 +316,80 @@ void SamyRun()
        LED(LED_ORANGE, 200);
        LED(LED_RED,    200);
 
+}
+
+#endif
+
+
+
+#ifdef WITH_ISO14443a_StandAlone
+void StandAloneMode14a()
+{
+       StandAloneMode();
+       FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+
        int selected = 0;
        int playing = 0;
-       int cardRead = 0;
+       int cardRead[OPTS] = {0};
+       uint8_t readUID[10] = {0};
+       uint32_t uid_1st[OPTS]={0};
+       uint32_t uid_2nd[OPTS]={0};
 
-       // Turn on selected LED
        LED(selected + 1, 0);
 
        for (;;)
        {
                usb_poll();
-    WDT_HIT();
+               WDT_HIT();
 
                // Was our button held down or pressed?
                int button_pressed = BUTTON_HELD(1000);
                SpinDelay(300);
 
                // Button was held for a second, begin recording
-               if (button_pressed > 0 && cardRead == 0)
+               if (button_pressed > 0 && cardRead[selected] == 0)
                {
                        LEDsoff();
                        LED(selected + 1, 0);
                        LED(LED_RED2, 0);
 
                        // record
-                       DbpString("Starting recording");
+                       Dbprintf("Enabling iso14443a reader mode for [Bank: %u]...", selected);
 
                        // wait for button to be released
                        while(BUTTON_PRESS())
                                WDT_HIT();
-
                        /* need this delay to prevent catching some weird data */
                        SpinDelay(500);
+                       /* Code for reading from 14a tag */
+                       uint8_t uid[10]  ={0};
+                       uint32_t cuid;
+                       iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
 
-                       CmdHIDdemodFSK(1, &high[selected], &low[selected], 0);
-                       Dbprintf("Recorded %x %x %x", selected, high[selected], low[selected]);
+                       for ( ; ; )
+                       {
+                               WDT_HIT();
+                               if (!iso14443a_select_card(uid, NULL, &cuid))
+                                       continue;
+                               else
+                               {
+                                       Dbprintf("Read UID:"); Dbhexdump(10,uid,0);
+                                       memcpy(readUID,uid,10*sizeof(uint8_t));
+                                       uint8_t *dst = (uint8_t *)&uid_1st[selected];
+                                       // Set UID byte order
+                                       for (int i=0; i<4; i++)
+                                               dst[i] = uid[3-i];
+                                       dst = (uint8_t *)&uid_2nd[selected];
+                                       for (int i=0; i<4; i++)
+                                               dst[i] = uid[7-i];
+                                       break;
+                               }
+                       }
+                       LEDsoff();
+                       LED(LED_GREEN,  200);
+                       LED(LED_ORANGE, 200);
+                       LED(LED_GREEN,  200);
+                       LED(LED_ORANGE, 200);
 
                        LEDsoff();
                        LED(selected + 1, 0);
@@ -365,30 +398,79 @@ void SamyRun()
                        // If we were previously playing, set playing off
                        // so next button push begins playing what we recorded
                        playing = 0;
-                       
-                       cardRead = 1;
-       
-               }
 
-               else if (button_pressed > 0 && cardRead == 1)
+                       cardRead[selected] = 1;
+
+               }
+               /* MF UID clone */
+               else if (button_pressed > 0 && cardRead[selected] == 1)
                {
                                        LEDsoff();
                                        LED(selected + 1, 0);
-                                       LED(LED_ORANGE, 0);
+                                       LED(LED_ORANGE, 250);
+
 
                                        // record
-                                       Dbprintf("Cloning %x %x %x", selected, high[selected], low[selected]);
+                                       Dbprintf("Preparing to Clone card [Bank: %x]; uid: %08x", selected, uid_1st[selected]);
 
                                        // wait for button to be released
                                        while(BUTTON_PRESS())
+                                       {
+                                               // Delay cloning until card is in place
                                                WDT_HIT();
-
-                                       /* need this delay to prevent catching some weird data */
+                                       }
+                                       Dbprintf("Starting clone. [Bank: %u]", selected);
+                                       // need this delay to prevent catching some weird data
                                        SpinDelay(500);
+                                       // Begin clone function here:
+                                       /* Example from client/mifarehost.c for commanding a block write for "magic Chinese" cards:
+                                                       UsbCommand c = {CMD_MIFARE_CSETBLOCK, {wantWipe, params & (0xFE | (uid == NULL ? 0:1)), blockNo}};
+                                                       memcpy(c.d.asBytes, data, 16);
+                                                       SendCommand(&c);
+
+                                               Block read is similar:
+                                                       UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, 0, blockNo}};
+                                               We need to imitate that call with blockNo 0 to set a uid.
+
+                                               The get and set commands are handled in this file:
+                                                       // Work with "magic Chinese" card
+                                                       case CMD_MIFARE_CSETBLOCK:
+                                                                       MifareCSetBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                                                                       break;
+                                                       case CMD_MIFARE_CGETBLOCK:
+                                                                       MifareCGetBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                                                                                                       //
+                                                                       break;
 
-                                       CopyHIDtoT55x7(high[selected], low[selected], 0, 0);
-                                       Dbprintf("Cloned %x %x %x", selected, high[selected], low[selected]);
-
+                                               mfCSetUID provides example logic for UID set workflow:
+                                                       -Read block0 from card in field with MifareCGetBlock()
+                                                       -Configure new values without replacing reserved bytes
+                                                                       memcpy(block0, uid, 4); // Copy UID bytes from byte array
+                                                                       // Mifare UID BCC
+                                                                       block0[4] = block0[0]^block0[1]^block0[2]^block0[3]; // BCC on byte 5
+                                                                       Bytes 5-7 are reserved SAK and ATQA for mifare classic
+                                                       -Use mfCSetBlock(0, block0, oldUID, wantWipe, CSETBLOCK_SINGLE_OPER) to write it
+                                       */
+                                       uint8_t oldBlock0[16] = {0}, newBlock0[16] = {0}, testBlock0[16] = {0};
+                                       // arg0 = Flags == CSETBLOCK_SINGLE_OPER=0x1F, arg1=returnSlot, arg2=blockNo
+                                       MifareCGetBlock(0x1F, 1, 0, oldBlock0);
+                                       Dbprintf("UID from target tag: %02X%02X%02X%02X", oldBlock0[0],oldBlock0[1],oldBlock0[2],oldBlock0[3]);
+                                       memcpy(newBlock0,oldBlock0,16);
+                                       // Copy uid_1st for bank (2nd is for longer UIDs not supported if classic)
+
+                                       newBlock0[0] = uid_1st[selected]>>24;
+                                       newBlock0[1] = 0xFF & (uid_1st[selected]>>16);
+                                       newBlock0[2] = 0xFF & (uid_1st[selected]>>8);
+                                       newBlock0[3] = 0xFF & (uid_1st[selected]);
+                                       newBlock0[4] = newBlock0[0]^newBlock0[1]^newBlock0[2]^newBlock0[3];
+                                       // arg0 = needWipe, arg1 = workFlags, arg2 = blockNo, datain
+                                       MifareCSetBlock(0, 0xFF,0, newBlock0);
+                                       MifareCGetBlock(0x1F, 1, 0, testBlock0);
+                                       if (memcmp(testBlock0,newBlock0,16)==0)
+                                       {
+                                               DbpString("Cloned successfull!");
+                                               cardRead[selected] = 0; // Only if the card was cloned successfully should we clear it
+                                       }
                                        LEDsoff();
                                        LED(selected + 1, 0);
                                        // Finished recording
@@ -396,13 +478,10 @@ void SamyRun()
                                        // If we were previously playing, set playing off
                                        // so next button push begins playing what we recorded
                                        playing = 0;
-                                       
-                                       cardRead = 0;
-                       
-               }
 
+               }
                // Change where to record (or begin playing)
-               else if (button_pressed)
+               else if (button_pressed && cardRead[selected])
                {
                        // Next option if we were previously playing
                        if (playing)
@@ -417,18 +496,12 @@ void SamyRun()
                        {
                                LED(LED_GREEN, 0);
                                DbpString("Playing");
-                               // wait for button to be released
-                               while(BUTTON_PRESS())
-                                       WDT_HIT();
-                               Dbprintf("%x %x %x", selected, high[selected], low[selected]);
-                               CmdHIDsimTAG(high[selected], low[selected], 0);
-                               DbpString("Done playing");
-                               if (BUTTON_HELD(1000) > 0)
-                                       {
-                                       DbpString("Exiting");
-                                       LEDsoff();
-                                       return;
+                               while (!BUTTON_HELD(500)) { // Loop simulating tag until the button is held a half-sec
+                                               Dbprintf("Simulating ISO14443a tag with uid[0]: %08x, uid[1]: %08x [Bank: %u]", uid_1st[selected],uid_2nd[selected],selected);
+                                               SimulateIso14443aTag(1,uid_1st[selected],uid_2nd[selected],NULL);
                                        }
+                               //cardRead[selected] = 1;
+                               Dbprintf("Done playing [Bank: %u]",selected);
 
                                /* We pressed a button so ignore it here with a delay */
                                SpinDelay(300);
@@ -445,92 +518,50 @@ void SamyRun()
                }
        }
 }
-#endif
-#endif
-#ifdef WITH_ISO14443a
-#ifdef WITH_ISO14443a_StandAlone
-void StandAloneMode14a()
+#elif WITH_LF
+// samy's sniff and repeat routine
+void SamyRun()
 {
-       DbpString("Stand-alone mode! No PC necessary.");
-       FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-
-       // 3 possible options? no just 1 for now
-#undef OPTS
-#define OPTS 2
-       // Oooh pretty -- notify user we're in elite samy mode now
-       LED(LED_RED,    200);
-       LED(LED_ORANGE, 200);
-       LED(LED_GREEN,  200);
-       LED(LED_ORANGE, 200);
-       LED(LED_RED,    200);
-       LED(LED_ORANGE, 200);
-       LED(LED_GREEN,  200);
-       LED(LED_ORANGE, 200);
-       LED(LED_RED,    200);
+       StandAloneMode();
+       FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
+       int high[OPTS], low[OPTS];
        int selected = 0;
        int playing = 0;
-       int cardRead[OPTS] = {0};
-       uint8_t readUID[10] = {0};
-       int uid_1st[OPTS]={0};
-       int uid_2nd[OPTS]={0};
+       int cardRead = 0;
 
+       // Turn on selected LED
        LED(selected + 1, 0);
 
        for (;;)
        {
                usb_poll();
-    WDT_HIT();
+               WDT_HIT();
 
                // Was our button held down or pressed?
                int button_pressed = BUTTON_HELD(1000);
-
                SpinDelay(300);
 
                // Button was held for a second, begin recording
-               if (button_pressed > 0 && cardRead[selected] == 0)
+               if (button_pressed > 0 && cardRead == 0)
                {
                        LEDsoff();
                        LED(selected + 1, 0);
                        LED(LED_RED2, 0);
 
                        // record
-                       Dbprintf("Enabling iso14443a reader mode for [Bank: %u]...", selected);
+                       DbpString("Starting recording");
 
                        // wait for button to be released
                        while(BUTTON_PRESS())
                                WDT_HIT();
+
                        /* need this delay to prevent catching some weird data */
                        SpinDelay(500);
-                       /* Code for reading from 14a tag */
-                       uint8_t uid[10]  ={0};
-                       uint32_t cuid;
-                       iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
 
-                       for ( ; ; )
-                       {
-                               if (!iso14443a_select_card(uid, NULL, &cuid))
-                                       continue;
-                               else
-                               {
-                                       Dbprintf("Read UID:"); Dbhexdump(10,uid,0);
-                                       memcpy(readUID,uid,10*sizeof(uint8_t));
-                                       uint8_t *dst = (uint8_t *)&uid_1st[selected];
-                                       // Set UID byte order 
-                                       for (int i=0; i<4; i++)
-                                               dst[i] = uid[3-i];
-                                       dst = (uint8_t *)&uid_2nd[selected];
-                                       for (int i=0; i<4; i++)
-                                               dst[i] = uid[7-i];
-                                       break;
-                               }
-                       } 
-                       LEDsoff();
-                        LED(LED_GREEN,  200);
-                        LED(LED_ORANGE, 200);
-                        LED(LED_GREEN,  200);
-                        LED(LED_ORANGE, 200);
-                       
+                       CmdHIDdemodFSK(1, &high[selected], &low[selected], 0);
+                       Dbprintf("Recorded %x %x %x", selected, high[selected], low[selected]);
+
                        LEDsoff();
                        LED(selected + 1, 0);
                        // Finished recording
@@ -539,77 +570,29 @@ void StandAloneMode14a()
                        // so next button push begins playing what we recorded
                        playing = 0;
                        
-                       cardRead[selected] = 1;
+                       cardRead = 1;
        
                }
-/* MF UID clone */
-               else if (button_pressed > 0 && cardRead[selected] == 1)
+
+               else if (button_pressed > 0 && cardRead == 1)
                {
                                        LEDsoff();
                                        LED(selected + 1, 0);
-                                       LED(LED_ORANGE, 250);
-
+                                       LED(LED_ORANGE, 0);
 
                                        // record
-                                       Dbprintf("Preparing to Clone card [Bank: %x]; uid: %08x", selected, uid_1st[selected]);
+                                       Dbprintf("Cloning %x %x %x", selected, high[selected], low[selected]);
 
                                        // wait for button to be released
                                        while(BUTTON_PRESS())
-                                               { 
-                                               // Delay cloning until card is in place
                                                WDT_HIT();
-                                               }
-                                       Dbprintf("Starting clone. [Bank: %u]", selected);
-                                       // need this delay to prevent catching some weird data
+
+                                       /* need this delay to prevent catching some weird data */
                                        SpinDelay(500);
-                                       // Begin clone function here:
-                                       /* Example from client/mifarehost.c for commanding a block write for "magic Chinese" cards:
-                                                       UsbCommand c = {CMD_MIFARE_CSETBLOCK, {wantWipe, params & (0xFE | (uid == NULL ? 0:1)), blockNo}};
-                                               memcpy(c.d.asBytes, data, 16);
-                                               SendCommand(&c);
-
-                                       Block read is similar:
-                                               UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, 0, blockNo}};
-                                       We need to imitate that call with blockNo 0 to set a uid.
-
-                                       The get and set commands are handled in this file:
-                                               // Work with "magic Chinese" card
-                                       case CMD_MIFARE_CSETBLOCK:
-                                               MifareCSetBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
-                                               break;
-                                       case CMD_MIFARE_CGETBLOCK:
-                                               MifareCGetBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
-                                                                               // 
-                                               break;  
 
-                                               mfCSetUID provides example logic for UID set workflow:
-                                                       -Read block0 from card in field with MifareCGetBlock()
-                                                       -Configure new values without replacing reserved bytes
-                                                               memcpy(block0, uid, 4); // Copy UID bytes from byte array
-                                                               // Mifare UID BCC
-                                                               block0[4] = block0[0]^block0[1]^block0[2]^block0[3]; // BCC on byte 5
-                                                               Bytes 5-7 are reserved SAK and ATQA for mifare classic
-                                               -Use mfCSetBlock(0, block0, oldUID, wantWipe, CSETBLOCK_SINGLE_OPER) to write it
-                               */
-                               uint8_t oldBlock0[16] = {0}, newBlock0[16] = {0}, testBlock0[16] = {0};
-                               // arg0 = Flags == CSETBLOCK_SINGLE_OPER=0x1F, arg1=returnSlot, arg2=blockNo 
-                               MifareCGetBlock(0x1F, 1, 0, oldBlock0);
-                               Dbprintf("UID from target tag: %02X%02X%02X%02X", oldBlock0[0],oldBlock0[1],oldBlock0[2],oldBlock0[3]);
-                               memcpy(newBlock0,oldBlock0,16);
-                               // Copy uid_1st for bank (2nd is for longer UIDs not supported if classic)
-                               newBlock0[0] = uid_1st[selected]>>24;
-                               newBlock0[1] = 0xFF & (uid_1st[selected]>>16);
-                               newBlock0[2] = 0xFF & (uid_1st[selected]>>8);
-                               newBlock0[3] = 0xFF & (uid_1st[selected]);
-                               newBlock0[4] = newBlock0[0]^newBlock0[1]^newBlock0[2]^newBlock0[3];
-                               // arg0 = needWipe, arg1 = workFlags, arg2 = blockNo, datain
-                               MifareCSetBlock(0, 0xFF,0, newBlock0);
-                               MifareCGetBlock(0x1F, 1, 0, testBlock0);
-                               if (memcmp(testBlock0,newBlock0,16)==0)
-                               {
-                                       DbpString("Cloned successfull!");
-                                       cardRead[selected] = 0; // Only if the card was cloned successfully should we clear it
-                               }
+                                       CopyHIDtoT55x7(high[selected], low[selected], 0, 0);
+                                       Dbprintf("Cloned %x %x %x", selected, high[selected], low[selected]);
+
                                        LEDsoff();
                                        LED(selected + 1, 0);
                                        // Finished recording
@@ -617,10 +600,13 @@ void StandAloneMode14a()
                                        // If we were previously playing, set playing off
                                        // so next button push begins playing what we recorded
                                        playing = 0;
+                                       
+                                       cardRead = 0;
                        
                }
+
                // Change where to record (or begin playing)
-               else if (button_pressed && cardRead[selected])
+               else if (button_pressed)
                {
                        // Next option if we were previously playing
                        if (playing)
@@ -635,12 +621,18 @@ void StandAloneMode14a()
                        {
                                LED(LED_GREEN, 0);
                                DbpString("Playing");
-                   while (!BUTTON_HELD(500)) { // Loop simulating tag until the button is held a half-sec
-                           Dbprintf("Simulating ISO14443a tag with uid[0]: %08x, uid[1]: %08x [Bank: %u]", uid_1st[selected],uid_2nd[selected],selected);
-                                       SimulateIso14443aTag(1,uid_1st[selected],uid_2nd[selected],NULL);       
+                               // wait for button to be released
+                               while(BUTTON_PRESS())
+                                       WDT_HIT();
+                               Dbprintf("%x %x %x", selected, high[selected], low[selected]);
+                               CmdHIDsimTAG(high[selected], low[selected], 0);
+                               DbpString("Done playing");
+                               if (BUTTON_HELD(1000) > 0)
+                                       {
+                                       DbpString("Exiting");
+                                       LEDsoff();
+                                       return;
                                        }
-                               //cardRead[selected] = 1; 
-                               Dbprintf("Done playing [Bank: %u]",selected);
 
                                /* We pressed a button so ignore it here with a delay */
                                SpinDelay(300);
@@ -651,13 +643,13 @@ void StandAloneMode14a()
                                LEDsoff();
                                LED(selected + 1, 0);
                        }
-                       else 
+                       else
                                while(BUTTON_PRESS())
                                        WDT_HIT();
                }
        }
 }
-#endif
+
 #endif
 /*
 OBJECTIVE
Impressum, Datenschutz