Merge some PM3 master commits. Had to re-make the StandAloneMode to work with flags...

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b7247c2aa83d7b9fb43ac62681e0a3a5985316e..d5a3e3150436eba43a46fc14d5f4a1ec5508b9f5 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,8 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
 - Added 'hw status'. This command makes the ARM print out some runtime information. (holiman) 
 - Added 'hw ping'. This command just sends a usb packets and checks if the pm3 is responsive. Can be used to abort certain operations which supports abort over usb. (holiman)
 
 - Added 'hw status'. This command makes the ARM print out some runtime information. (holiman) 
 - Added 'hw ping'. This command just sends a usb packets and checks if the pm3 is responsive. Can be used to abort certain operations which supports abort over usb. (holiman)
 

-### Changed
+### Changed                                                                                                                                            
+- Revised workflow for StandAloneMode14a (Craig Young)

 - Changed lf config's `threshold` to a graph (signed) metric and it will trigger on + or - value set to. (example: set to 50 and recording would begin at first graphed value of >= 50 or <= -50) (marshmellow)
 - EPA functions (`hf epa`) now support both ISO 14443-A and 14443-B cards (frederikmoellers)
 - 'hw version' only talks to ARM at startup, after that the info is cached. (pwpiwi)
 - Changed lf config's `threshold` to a graph (signed) metric and it will trigger on + or - value set to. (example: set to 50 and recording would begin at first graphed value of >= 50 or <= -50) (marshmellow)
 - EPA functions (`hf epa`) now support both ISO 14443-A and 14443-B cards (frederikmoellers)
 - 'hw version' only talks to ARM at startup, after that the info is cached. (pwpiwi)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 03e6eba2f1f630b37e338adb2f0aebb8800e0d17..3dcf48cc30ccb9a5dba093c5fdcaca5e60da0e5b 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -343,11 +343,14 @@ void StandAloneMode14a()
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
        int selected = 0;
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
        int selected = 0;

-       int playing = 0;
+       int playing = 0, iGotoRecord = 0, iGotoClone = 0;

        int cardRead[OPTS] = {0};
        uint8_t readUID[10] = {0};
        uint32_t uid_1st[OPTS]={0};
        uint32_t uid_2nd[OPTS]={0};
        int cardRead[OPTS] = {0};
        uint8_t readUID[10] = {0};
        uint32_t uid_1st[OPTS]={0};
        uint32_t uid_2nd[OPTS]={0};

+       uint32_t uid_tmp1 = 0;
+       uint32_t uid_tmp2 = 0;
+       iso14a_card_select_t hi14a_card[OPTS];

 
        LED(selected + 1, 0);
 
 
        LED(selected + 1, 0);
 


@@ -355,24 +358,17 @@ void StandAloneMode14a()
        {
                usb_poll();
                WDT_HIT();
        {
                usb_poll();
                WDT_HIT();

-
-               // Was our button held down or pressed?
-               int button_pressed = BUTTON_HELD(1000);

                SpinDelay(300);
 
                SpinDelay(300);
 

-               // Button was held for a second, begin recording
-               if (button_pressed > 0 && cardRead[selected] == 0)
+               if (iGotoRecord == 1 || cardRead[selected] == 0)

                {
                {

+                       iGotoRecord = 0;

                        LEDsoff();
                        LED(selected + 1, 0);
                        LED(LED_RED2, 0);
 
                        // record
                        Dbprintf("Enabling iso14443a reader mode for [Bank: %u]...", selected);
                        LEDsoff();
                        LED(selected + 1, 0);
                        LED(LED_RED2, 0);
 
                        // record
                        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 */
                        /* need this delay to prevent catching some weird data */
                        SpinDelay(500);
                        /* Code for reading from 14a tag */


@@ -383,22 +379,54 @@ void StandAloneMode14a()
                        for ( ; ; )
                        {
                                WDT_HIT();
                        for ( ; ; )
                        {
                                WDT_HIT();

-                               if (!iso14443a_select_card(uid, NULL, &cuid))
+                               if (BUTTON_PRESS()) {
+                                       if (cardRead[selected]) {
+                                               Dbprintf("Button press detected -- replaying card in bank[%d]", selected);
+                                               break;
+                                       }
+                                       else if (cardRead[(selected+1)%OPTS]) {
+                                               Dbprintf("Button press detected but no card in bank[%d] so playing from bank[%d]", selected, (selected+1)%OPTS);
+                                               selected = (selected+1)%OPTS;
+                                               break; // playing = 1;
+                                       }
+                                       else {
+                                               Dbprintf("Button press detected but no stored tag to play. (Ignoring button)");
+                                               SpinDelay(300);
+                                       }
+                               }
+                               if (!iso14443a_select_card(uid, &hi14a_card[selected], &cuid))

                                        continue;
                                else
                                {
                                        Dbprintf("Read UID:"); Dbhexdump(10,uid,0);
                                        memcpy(readUID,uid,10*sizeof(uint8_t));
                                        continue;
                                else
                                {
                                        Dbprintf("Read UID:"); Dbhexdump(10,uid,0);
                                        memcpy(readUID,uid,10*sizeof(uint8_t));

-                                       uint8_t *dst = (uint8_t *)&uid_1st[selected];
+                                       uint8_t *dst = (uint8_t *)&uid_tmp1;

                                        // Set UID byte order
                                        for (int i=0; i<4; i++)
                                                dst[i] = uid[3-i];
                                        // Set UID byte order
                                        for (int i=0; i<4; i++)
                                                dst[i] = uid[3-i];

-                                       dst = (uint8_t *)&uid_2nd[selected];
+                                       dst = (uint8_t *)&uid_tmp2;

                                        for (int i=0; i<4; i++)
                                                dst[i] = uid[7-i];
                                        for (int i=0; i<4; i++)
                                                dst[i] = uid[7-i];

+                                       if (uid_1st[(selected+1)%OPTS] == uid_tmp1 && uid_2nd[(selected+1)%OPTS] == uid_tmp2) {
+                                               Dbprintf("Card selected has same UID as what is stored in the other bank. Skipping.");
+                                       }
+                                       else {
+                                               if (uid_tmp2) {
+                                                       Dbprintf("Bank[%d] received a 7-byte UID",selected);
+                                                       uid_1st[selected] = (uid_tmp1)>>8;
+                                                       uid_2nd[selected] = (uid_tmp1<<24) + (uid_tmp2>>8);
+                                               }
+                                               else {
+                                                       Dbprintf("Bank[%d] received a 4-byte UID",selected);
+                                                       uid_1st[selected] = uid_tmp1;
+                                                       uid_2nd[selected] = uid_tmp2;
+                                               }

                                        break;
                                }
                        }
                                        break;
                                }
                        }

+                       }
+                       Dbprintf("ATQA = %02X%02X",hi14a_card[selected].atqa[0],hi14a_card[selected].atqa[1]);
+                       Dbprintf("SAK = %02X",hi14a_card[selected].sak);

                        LEDsoff();
                        LED(LED_GREEN,  200);
                        LED(LED_ORANGE, 200);
                        LEDsoff();
                        LED(LED_GREEN,  200);
                        LED(LED_ORANGE, 200);


@@ -407,18 +435,16 @@ void StandAloneMode14a()
 
                        LEDsoff();
                        LED(selected + 1, 0);
 
                        LEDsoff();
                        LED(selected + 1, 0);

-                       // Finished recording

 
 

-                       // If we were previously playing, set playing off
-                       // so next button push begins playing what we recorded
-                       playing = 0;
+                       // Next state is replay:
+                       playing = 1;

 
                        cardRead[selected] = 1;
 
                        cardRead[selected] = 1;

-

                }
                }

-               /* MF UID clone */
-               else if (button_pressed > 0 && cardRead[selected] == 1)
+               /* MF Classic UID clone */
+               else if (iGotoClone==1)

                {
                {

+                       iGotoClone=0;

                                        LEDsoff();
                                        LED(selected + 1, 0);
                                        LED(LED_ORANGE, 250);
                                        LEDsoff();
                                        LED(selected + 1, 0);
                                        LED(LED_ORANGE, 250);


@@ -453,7 +479,6 @@ void StandAloneMode14a()
                                                                        break;
                                                        case CMD_MIFARE_CGETBLOCK:
                                                                        MifareCGetBlock(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:
                                                                        break;
 
                                                mfCSetUID provides example logic for UID set workflow:


@@ -467,7 +492,12 @@ void StandAloneMode14a()
                                        */
                                        uint8_t oldBlock0[16] = {0}, newBlock0[16] = {0}, testBlock0[16] = {0};
                                        // arg0 = Flags == CSETBLOCK_SINGLE_OPER=0x1F, arg1=returnSlot, arg2=blockNo
                                        */
                                        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);
+                       MifareCGetBlock(0x3F, 1, 0, oldBlock0);
+                       if (oldBlock0[0] == 0 && oldBlock0[0] == oldBlock0[1]  && oldBlock0[1] == oldBlock0[2] && oldBlock0[2] == oldBlock0[3]) {
+                               Dbprintf("No changeable tag detected. Returning to replay mode for bank[%d]", selected);
+                               playing = 1;
+                       }
+                       else {

                                        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)
                                        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)


@@ -479,29 +509,27 @@ void StandAloneMode14a()
                                        newBlock0[4] = newBlock0[0]^newBlock0[1]^newBlock0[2]^newBlock0[3];
                                        // arg0 = needWipe, arg1 = workFlags, arg2 = blockNo, datain
                                        MifareCSetBlock(0, 0xFF,0, newBlock0);
                                        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);
+                               MifareCGetBlock(0x3F, 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
                                        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
-
-                                       // If we were previously playing, set playing off
-                                       // so next button push begins playing what we recorded

                                        playing = 0;
                                        playing = 0;

+                                       iGotoRecord = 1;
+                               selected = (selected + 1) % OPTS;
+                               }
+                               else {
+                                       Dbprintf("Clone failed. Back to replay mode on bank[%d]", selected);
+                                       playing = 1;
+                               }
+                       }
+                       LEDsoff();
+                       LED(selected + 1, 0);

 
                }
                // Change where to record (or begin playing)
 
                }
                // Change where to record (or begin playing)

-               else if (button_pressed && cardRead[selected])
+               else if (playing==1) // button_pressed == BUTTON_SINGLE_CLICK && cardRead[selected])

                {
                {

-                       // Next option if we were previously playing
-                       if (playing)
-                               selected = (selected + 1) % OPTS;
-                       playing = !playing;
-

                        LEDsoff();
                        LED(selected + 1, 0);
 
                        LEDsoff();
                        LED(selected + 1, 0);
 


@@ -510,19 +538,49 @@ void StandAloneMode14a()
                        {
                                LED(LED_GREEN, 0);
                                DbpString("Playing");
                        {
                                LED(LED_GREEN, 0);
                                DbpString("Playing");

-                               while (!BUTTON_HELD(500)) { // Loop simulating tag until the button is held a half-sec
+                               for ( ; ; ) {
+                                       WDT_HIT();
+                                       int button_action = BUTTON_HELD(1000);
+                                       if (button_action == 0) { // No button action, proceed with sim
+                                               uint8_t data[512] = {0}; // in case there is a read command received we shouldn't break
+                                               uint8_t flags = ( uid_2nd[selected] > 0x00 ) ? FLAG_7B_UID_IN_DATA : FLAG_4B_UID_IN_DATA;
+                                               num_to_bytes(uid_1st[selected], 3, data);
+                                               num_to_bytes(uid_2nd[selected], 4, data);
+                                               

                                                Dbprintf("Simulating ISO14443a tag with uid[0]: %08x, uid[1]: %08x [Bank: %u]", uid_1st[selected],uid_2nd[selected],selected);
                                                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);
+                                               if (hi14a_card[selected].sak == 8 && hi14a_card[selected].atqa[0] == 4 && hi14a_card[selected].atqa[1] == 0) {
+                                                       DbpString("Mifare Classic");
+                                                       SimulateIso14443aTag(1, flags, data); // Mifare Classic
+                                               }
+                                               else if (hi14a_card[selected].sak == 0 && hi14a_card[selected].atqa[0] == 0x44 && hi14a_card[selected].atqa[1] == 0) {
+                                                       DbpString("Mifare Ultralight");
+                                                       SimulateIso14443aTag(2, flags, data); // Mifare Ultralight
+                                               }
+                                               else if (hi14a_card[selected].sak == 20 && hi14a_card[selected].atqa[0] == 0x44 && hi14a_card[selected].atqa[1] == 3) {
+                                                       DbpString("Mifare DESFire");
+                                                       SimulateIso14443aTag(3, flags, data); // Mifare DESFire
+                                               }
+                                               else {
+                                                       Dbprintf("Unrecognized tag type -- defaulting to Mifare Classic emulation");
+                                                       SimulateIso14443aTag(1, flags, data);
+                                               }
+                                       }
+                                       else if (button_action == BUTTON_SINGLE_CLICK) {
+                                               selected = (selected + 1) % OPTS;
+                                               Dbprintf("Done playing. Switching to record mode on bank %d",selected);
+                                               iGotoRecord = 1;
+                                               break;
+                                       }
+                                       else if (button_action == BUTTON_HOLD) {
+                                               Dbprintf("Playtime over. Begin cloning...");
+                                               iGotoClone = 1;
+                                               break;

                                        }
                                        }

-                               //cardRead[selected] = 1;
-                               Dbprintf("Done playing [Bank: %u]",selected);
+                                       WDT_HIT();
+                               }

 
                                /* We pressed a button so ignore it here with a delay */
                                SpinDelay(300);
 
                                /* We pressed a button so ignore it here with a delay */
                                SpinDelay(300);

-
-                               // when done, we're done playing, move to next option
-                               selected = (selected + 1) % OPTS;
-                               playing = !playing;

                                LEDsoff();
                                LED(selected + 1, 0);
                        }
                                LEDsoff();
                                LED(selected + 1, 0);
                        }


@@ -991,7 +1049,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        ReaderIso14443a(c);
                        break;
                case CMD_SIMULATE_TAG_ISO_14443a:
                        ReaderIso14443a(c);
                        break;
                case CMD_SIMULATE_TAG_ISO_14443a:

-                       SimulateIso14443aTag(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);  // ## Simulate iso14443a tag - pass tag type & UID
+                       SimulateIso14443aTag(c->arg[0], c->arg[1], c->d.asBytes);  // ## Simulate iso14443a tag - pass tag type & UID

                        break;
                        
                case CMD_EPA_PACE_COLLECT_NONCE:
                        break;
                        
                case CMD_EPA_PACE_COLLECT_NONCE:

diff --git a/armsrc/apps.h b/armsrc/apps.h
index ff0b3472f2f7630007459ba00fc23313bb9f7344..5eff451159ff924bdc03d29eed0e14d12ad67ebc 100644 (file)
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -106,7 +106,7 @@ void SendRawCommand14443B(uint32_t, uint32_t, uint8_t, uint8_t[]);
 
 /// iso14443a.h
 void RAMFUNC SniffIso14443a(uint8_t param);
 
 /// iso14443a.h
 void RAMFUNC SniffIso14443a(uint8_t param);

-void SimulateIso14443aTag(int tagType, int uid_1st, int uid_2nd, byte_t* data);
+void SimulateIso14443aTag(int tagType, int flags, byte_t* data);

 void ReaderIso14443a(UsbCommand * c);
 // Also used in iclass.c
 bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t len, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag);
 void ReaderIso14443a(UsbCommand * c);
 // Also used in iclass.c
 bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t len, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag);

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 38688a07f9d9bb4eb260406fc799164fd04baf1a..862594e9c483293a7824184cd6385d8921f49788 100644 (file)
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -935,7 +935,7 @@ bool prepare_allocated_tag_modulation(tag_response_info_t* response_info) {
 // Main loop of simulated tag: receive commands from reader, decide what
 // response to send, and send it.
 //-----------------------------------------------------------------------------
 // Main loop of simulated tag: receive commands from reader, decide what
 // response to send, and send it.
 //-----------------------------------------------------------------------------

-void SimulateIso14443aTag(int tagType, int flags, int uid_2nd, byte_t* data)
+void SimulateIso14443aTag(int tagType, int flags, byte_t* data)

 {
 
        //Here, we collect UID,NT,AR,NR,UID2,NT2,AR2,NR2
 {
 
        //Here, we collect UID,NT,AR,NR,UID2,NT2,AR2,NR2

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 73fb8a5acdc7ae5238e2b72e807ea1a90c98294a..13c4a5b861ca682624319e84605a69b0f29766e9 100644 (file)
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -1138,6 +1138,7 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
        // bit 2 - need HALT after sequence\r
        // bit 3 - need init FPGA and field before sequence\r
        // bit 4 - need reset FPGA and LED\r
        // bit 2 - need HALT after sequence\r
        // bit 3 - need init FPGA and field before sequence\r
        // bit 4 - need reset FPGA and LED\r

+       // bit 5 - need to set datain instead of issuing USB reply (called via ARM for StandAloneMode14a)\r

        uint8_t workFlags = arg0;\r
        uint8_t blockNo = arg2;\r
        \r
        uint8_t workFlags = arg0;\r
        uint8_t blockNo = arg2;\r
        \r


@@ -1197,6 +1198,11 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
        }\r
        \r
        LED_B_ON();\r
        }\r
        \r
        LED_B_ON();\r

+       if (workFlags & 0x20) {\r
+               if (isOK)\r
+                       memcpy(datain, data, 18);\r
+       }\r
+       else\r

        cmd_send(CMD_ACK,isOK,0,0,data,18);\r
        LED_B_OFF();\r
 \r
        cmd_send(CMD_ACK,isOK,0,0,data,18);\r
        LED_B_OFF();\r
 \r