moved includes, added clear_trace flag (it was there...) and fixed multiapdu iso14443...

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 5a27e06b6193b73737b17a9ae40f2ec1e224c9ec..90e8538eb531c7c23c7e795c3f1b15d907fa1221 100644 (file)
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -1916,19 +1916,18 @@ void ReaderIso14443a(UsbCommand *c)
        uint8_t par[MAX_PARITY_SIZE];
        bool cantSELECT = false;
   
        uint8_t par[MAX_PARITY_SIZE];
        bool cantSELECT = false;
   

-       if(param & ISO14A_CONNECT) {
+       set_tracing(true);
+       
+       if(param & ISO14A_CLEAR_TRACE) {

                clear_trace();
        }
 
                clear_trace();
        }
 

-       set_tracing(true);
-

        if(param & ISO14A_REQUEST_TRIGGER) {
                iso14a_set_trigger(true);
        }
 
        if(param & ISO14A_CONNECT) {
                LED_A_ON();
        if(param & ISO14A_REQUEST_TRIGGER) {
                iso14a_set_trigger(true);
        }
 
        if(param & ISO14A_CONNECT) {
                LED_A_ON();

-               clear_trace();

                iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
                if(!(param & ISO14A_NO_SELECT)) {
                        iso14a_card_select_t *card = (iso14a_card_select_t*)buf;
                iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
                if(!(param & ISO14A_NO_SELECT)) {
                        iso14a_card_select_t *card = (iso14a_card_select_t*)buf;

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 1ae63adae791f0948502e63ba3ab993d6f6fca78..c2d12fd9d20fa56ef15a7ff85cce7ab1490a81f9 100644 (file)
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -11,9 +11,25 @@
 
 #include "cmdhf14a.h"
 
 
 #include "cmdhf14a.h"
 

+#include "util.h"
+#include "util_posix.h"
+#include "iso14443crc.h"
+#include "data.h"
+#include "proxmark3.h"
+#include "ui.h"
+#include "cmdparser.h"
+#include "common.h"
+#include "cmdmain.h"
+#include "mifare.h"
+#include "cmdhfmfu.h"
+#include "mifarehost.h"
+#include "emv/apduinfo.h"
+#include "emv/emvcore.h"
+

 static int CmdHelp(const char *Cmd);
 static int waitCmd(uint8_t iLen);
 
 static int CmdHelp(const char *Cmd);
 static int waitCmd(uint8_t iLen);
 

+

 const manufactureName manufactureMapping[] = {
        // ID,  "Vendor Country"
        { 0x01, "Motorola UK" },
 const manufactureName manufactureMapping[] = {
        // ID,  "Vendor Country"
        { 0x01, "Motorola UK" },


@@ -621,17 +637,22 @@ int CmdHF14ASnoop(const char *Cmd) {
 int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int *dataoutlen) {
        uint8_t data[USB_CMD_DATA_SIZE];
        int datalen;
 int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int *dataoutlen) {
        uint8_t data[USB_CMD_DATA_SIZE];
        int datalen;

-       uint8_t cmdc = 0;
+       uint16_t cmdc = 0;

        uint8_t first, second;
        uint8_t first, second;

+       static uint8_t iso14_pcb_blocknum;

        
        

-       if (activateField)
-               cmdc |= ISO14A_CONNECT;
+       if (activateField) {
+               cmdc |= ISO14A_CONNECT | ISO14A_CLEAR_TRACE;
+               iso14_pcb_blocknum = 0;
+       }

        if (leaveSignalON)
                cmdc |= ISO14A_NO_DISCONNECT;
 
        // ISO 14443 APDU frame: PCB [CID] [NAD] APDU CRC PCB=0x02
        memcpy(data + 1, datain, datainlen);
        data[0] = 0x02; // bnr,nad,cid,chn=0; i-block(0x00)     
        if (leaveSignalON)
                cmdc |= ISO14A_NO_DISCONNECT;
 
        // ISO 14443 APDU frame: PCB [CID] [NAD] APDU CRC PCB=0x02
        memcpy(data + 1, datain, datainlen);
        data[0] = 0x02; // bnr,nad,cid,chn=0; i-block(0x00)     

+       data[0] += iso14_pcb_blocknum; // add block number (bnr)
+

        datalen = datainlen + 1;
        
        ComputeCrc14443(CRC_14443_A, data, datalen, &first, &second);
        datalen = datainlen + 1;
        
        ComputeCrc14443(CRC_14443_A, data, datalen, &first, &second);


@@ -673,6 +694,14 @@ int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool lea
                        PrintAndLog("APDU ERROR: Small APDU response.");
                        return 2;
                }
                        PrintAndLog("APDU ERROR: Small APDU response.");
                        return 2;
                }

+
+               // invert block number field in PCB byte
+               if ( ((recv[0] & 0xC0) == 0 // I-Block
+                          || (recv[0] & 0xD0) == 0x80) // R-Block with ACK bit set to 0
+                        && (recv[0] & 0x01) == iso14_pcb_blocknum) // equal block numbers
+               {
+                       iso14_pcb_blocknum ^= 1;
+               }

                
                // check block
                if (data[0] != recv[0]) {
                
                // check block
                if (data[0] != recv[0]) {


@@ -905,7 +934,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
 
        if(active || active_select)
        {
 
        if(active || active_select)
        {

-               c.arg[0] |= ISO14A_CONNECT;
+               c.arg[0] |= ISO14A_CONNECT | ISO14A_CLEAR_TRACE;

                if(active)
                        c.arg[0] |= ISO14A_NO_SELECT;
        }
                if(active)
                        c.arg[0] |= ISO14A_NO_SELECT;
        }

diff --git a/client/cmdhf14a.h b/client/cmdhf14a.h
index 16e03574a4bc5d9b5c5d50277d4516a87ff5d229..e7784de250a6b3c9bd7281b5420ccb8bfe707a2f 100644 (file)
--- a/client/cmdhf14a.h
+++ b/client/cmdhf14a.h
@@ -18,20 +18,7 @@
 #include <inttypes.h>
 #include <string.h>
 #include <unistd.h>
 #include <inttypes.h>
 #include <string.h>
 #include <unistd.h>

-#include "util.h"
-#include "util_posix.h"
-#include "iso14443crc.h"
-#include "data.h"
-#include "proxmark3.h"
-#include "ui.h"
-#include "cmdparser.h"
-#include "common.h"
-#include "cmdmain.h"
-#include "mifare.h"
-#include "cmdhfmfu.h"
-#include "mifarehost.h"
-#include "emv/apduinfo.h"
-#include "emv/emvcore.h"
+#include <stdbool.h>

 
 // structure and database for uid -> tagtype lookups 
 typedef struct { 
 
 // structure and database for uid -> tagtype lookups 
 typedef struct { 

diff --git a/include/mifare.h b/include/mifare.h
index bede67a97723ebe56d649839d5c378a706d7db90..b821f32b5cb590ec347e9681ce59727a9cd2631f 100644 (file)
--- a/include/mifare.h
+++ b/include/mifare.h
@@ -35,7 +35,8 @@ typedef enum ISO14A_COMMAND {
        ISO14A_SET_TIMEOUT =            (1 << 6),
        ISO14A_NO_SELECT =                      (1 << 7),
        ISO14A_TOPAZMODE =                      (1 << 8),
        ISO14A_SET_TIMEOUT =            (1 << 6),
        ISO14A_NO_SELECT =                      (1 << 7),
        ISO14A_TOPAZMODE =                      (1 << 8),

-       ISO14A_NO_RATS =                        (1 << 9)
+       ISO14A_NO_RATS =                        (1 << 9),
+       ISO14A_CLEAR_TRACE =            (1 << 10)

 } iso14a_command_t;
 
 typedef struct {
 } iso14a_command_t;
 
 typedef struct {