git.zerfleddert.de Git - proxmark3-svn/blobdiff

index f5fcc91c49dbdd530c2b2b0f74499c3634e3fda9..2f4baf175d5a413c16252a3f58a0115b7461f853 100644 (file)

--- a/armsrc/iso14443a.c

+++ b/armsrc/iso14443a.c

@@ -25,6 +25,7 @@

#include "BigBuf.h"

#include "protocols.h"

#include "parity.h"

#include "BigBuf.h"

#include "protocols.h"

#include "parity.h"

+#include "fpgaloader.h"

typedef struct {

enum {

typedef struct {

enum {

@@ -318,15 +319,18 @@ static RAMFUNC bool MillerDecoding(uint8_t bit, uint32_t non_real_time)

Uart.startTime -= Uart.syncBit;

Uart.endTime = Uart.startTime;

Uart.state = STATE_START_OF_COMMUNICATION;

Uart.startTime -= Uart.syncBit;

Uart.endTime = Uart.startTime;

Uart.state = STATE_START_OF_COMMUNICATION;

+ LED_B_ON();

}

} else {

if (IsMillerModulationNibble1(Uart.fourBits >> Uart.syncBit)) {

if (IsMillerModulationNibble2(Uart.fourBits >> Uart.syncBit)) { // Modulation in both halves - error

}

} else {

if (IsMillerModulationNibble1(Uart.fourBits >> Uart.syncBit)) {

if (IsMillerModulationNibble2(Uart.fourBits >> Uart.syncBit)) { // Modulation in both halves - error

+ LED_B_OFF();

UartReset();

} else { // Modulation in first half = Sequence Z = logic "0"

if (Uart.state == STATE_MILLER_X) { // error - must not follow after X

UartReset();

} else { // Modulation in first half = Sequence Z = logic "0"

if (Uart.state == STATE_MILLER_X) { // error - must not follow after X

+ LED_B_OFF();

UartReset();

} else {

Uart.bitCount++;

UartReset();

} else {

Uart.bitCount++;

@@ -365,6 +369,7 @@ static RAMFUNC bool MillerDecoding(uint8_t bit, uint32_t non_real_time)

}

} else { // no modulation in both halves - Sequence Y

if (Uart.state == STATE_MILLER_Z || Uart.state == STATE_MILLER_Y) { // Y after logic "0" - End of Communication

}

} else { // no modulation in both halves - Sequence Y

if (Uart.state == STATE_MILLER_Z || Uart.state == STATE_MILLER_Y) { // Y after logic "0" - End of Communication

+ LED_B_OFF();

Uart.state = STATE_UNSYNCD;

Uart.bitCount--; // last "0" was part of EOC sequence

Uart.shiftReg <<= 1; // drop it

Uart.state = STATE_UNSYNCD;

Uart.bitCount--; // last "0" was part of EOC sequence

Uart.shiftReg <<= 1; // drop it

@@ -386,6 +391,7 @@ static RAMFUNC bool MillerDecoding(uint8_t bit, uint32_t non_real_time)

}

if (Uart.state == STATE_START_OF_COMMUNICATION) { // error - must not follow directly after SOC

}

if (Uart.state == STATE_START_OF_COMMUNICATION) { // error - must not follow directly after SOC

+ LED_B_OFF();

UartReset();

} else { // a logic "0"

Uart.bitCount++;

UartReset();

} else { // a logic "0"

Uart.bitCount++;

@@ -491,6 +497,7 @@ static RAMFUNC int ManchesterDecoding(uint8_t bit, uint16_t offset, uint32_t non

Demod.startTime -= Demod.syncBit;

Demod.bitCount = offset; // number of decoded data bits

Demod.state = DEMOD_MANCHESTER_DATA;

Demod.startTime -= Demod.syncBit;

Demod.bitCount = offset; // number of decoded data bits

Demod.state = DEMOD_MANCHESTER_DATA;

+ LED_C_ON();

}

@@ -533,6 +540,7 @@ static RAMFUNC int ManchesterDecoding(uint8_t bit, uint16_t offset, uint32_t non

}

Demod.endTime = Demod.startTime + 8*(9*Demod.len + Demod.bitCount + 1);

} else { // no modulation in both halves - End of communication

}

Demod.endTime = Demod.startTime + 8*(9*Demod.len + Demod.bitCount + 1);

} else { // no modulation in both halves - End of communication

+ LED_C_OFF();

if(Demod.bitCount > 0) { // there are some remaining data bits

Demod.shiftReg >>= (9 - Demod.bitCount); // right align the decoded bits

Demod.output[Demod.len++] = Demod.shiftReg & 0xff; // and add them to the output

if(Demod.bitCount > 0) { // there are some remaining data bits

Demod.shiftReg >>= (9 - Demod.bitCount); // right align the decoded bits

Demod.output[Demod.len++] = Demod.shiftReg & 0xff; // and add them to the output

@@ -573,6 +581,7 @@ void RAMFUNC SnoopIso14443a(uint8_t param) {

// bit 1 - trigger from first reader 7-bit request

LEDsoff();

// bit 1 - trigger from first reader 7-bit request

LEDsoff();

+ LED_A_ON();

iso14443a_setup(FPGA_HF_ISO14443A_SNIFFER);

@@ -625,7 +634,6 @@ void RAMFUNC SnoopIso14443a(uint8_t param) {

break;

}

break;

}

- LED_A_ON();

WDT_HIT();

int register readBufDataP = data - dmaBuf;

WDT_HIT();

int register readBufDataP = data - dmaBuf;

@@ -657,18 +665,15 @@ void RAMFUNC SnoopIso14443a(uint8_t param) {

AT91C_BASE_PDC_SSC->PDC_RNCR = DMA_BUFFER_SIZE;

}

AT91C_BASE_PDC_SSC->PDC_RNCR = DMA_BUFFER_SIZE;

}

- LED_A_OFF();

if (rsamples & 0x01) { // Need two samples to feed Miller and Manchester-Decoder

if(!TagIsActive) { // no need to try decoding reader data if the tag is sending

uint8_t readerdata = (previous_data & 0xF0) | (*data >> 4);

if (MillerDecoding(readerdata, (rsamples-1)*4)) {

if (rsamples & 0x01) { // Need two samples to feed Miller and Manchester-Decoder

if(!TagIsActive) { // no need to try decoding reader data if the tag is sending

uint8_t readerdata = (previous_data & 0xF0) | (*data >> 4);

if (MillerDecoding(readerdata, (rsamples-1)*4)) {

- LED_C_ON();

// check - if there is a short 7bit request from reader

- if ((!triggered) && (param & 0x02) && (Uart.len == 1) && (Uart.bitCount == 7)) triggered = true;

+ if ((!triggered) && (param & 0x02) && (Uart.len == 1) && (Uart.bitCount == 7)) {

+ triggered = true;

+ }

if(triggered) {

if (!LogTrace(receivedCmd,

Uart.len,

if(triggered) {

if (!LogTrace(receivedCmd,

Uart.len,

@@ -682,31 +687,24 @@ void RAMFUNC SnoopIso14443a(uint8_t param) {

/* And also reset the demod code, which might have been */

/* false-triggered by the commands from the reader. */

DemodReset();

/* And also reset the demod code, which might have been */

/* false-triggered by the commands from the reader. */

DemodReset();

- LED_B_OFF();

}

ReaderIsActive = (Uart.state != STATE_UNSYNCD);

}

ReaderIsActive = (Uart.state != STATE_UNSYNCD);

}

- if(!ReaderIsActive) { // no need to try decoding tag data if the reader is sending - and we cannot afford the time

+ if (!ReaderIsActive) { // no need to try decoding tag data if the reader is sending - and we cannot afford the time

uint8_t tagdata = (previous_data << 4) | (*data & 0x0F);

- if(ManchesterDecoding(tagdata, 0, (rsamples-1)*4)) {

- LED_B_ON();

+ if (ManchesterDecoding(tagdata, 0, (rsamples-1)*4)) {

if (!LogTrace(receivedResponse,

Demod.len,

Demod.startTime*16 - DELAY_TAG_AIR2ARM_AS_SNIFFER,

Demod.endTime*16 - DELAY_TAG_AIR2ARM_AS_SNIFFER,

Demod.parity,

false)) break;

if (!LogTrace(receivedResponse,

Demod.len,

Demod.startTime*16 - DELAY_TAG_AIR2ARM_AS_SNIFFER,

Demod.endTime*16 - DELAY_TAG_AIR2ARM_AS_SNIFFER,

Demod.parity,

false)) break;

if ((!triggered) && (param & 0x01)) triggered = true;

// And ready to receive another response.

DemodReset();

// And reset the Miller decoder including itS (now outdated) input buffer

UartInit(receivedCmd, receivedCmdPar);

// And ready to receive another response.

DemodReset();

// And reset the Miller decoder including itS (now outdated) input buffer

UartInit(receivedCmd, receivedCmdPar);

- LED_C_OFF();

}

TagIsActive = (Demod.state != DEMOD_UNSYNCD);

}

TagIsActive = (Demod.state != DEMOD_UNSYNCD);

}

@@ -720,12 +718,12 @@ void RAMFUNC SnoopIso14443a(uint8_t param) {

}

} // main cycle

}

} // main cycle

- DbpString("COMMAND FINISHED");

FpgaDisableSscDma();

+ LEDsoff();

+ DbpString("COMMAND FINISHED");

Dbprintf("maxDataLen=%d, Uart.state=%x, Uart.len=%d", maxDataLen, Uart.state, Uart.len);

Dbprintf("traceLen=%d, Uart.output[0]=%08x", BigBuf_get_traceLen(), (uint32_t)Uart.output[0]);

Dbprintf("maxDataLen=%d, Uart.state=%x, Uart.len=%d", maxDataLen, Uart.state, Uart.len);

Dbprintf("traceLen=%d, Uart.output[0]=%08x", BigBuf_get_traceLen(), (uint32_t)Uart.output[0]);

- LEDsoff();

}

//-----------------------------------------------------------------------------

}

//-----------------------------------------------------------------------------

@@ -1266,7 +1264,7 @@ static void PrepareDelayedTransfer(uint16_t delay)

//-------------------------------------------------------------------------------------

static void TransmitFor14443a(const uint8_t *cmd, uint16_t len, uint32_t *timing)

{

//-------------------------------------------------------------------------------------

static void TransmitFor14443a(const uint8_t *cmd, uint16_t len, uint32_t *timing)

{

+ LED_D_ON();

FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);

uint32_t ThisTransferTime = 0;

FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);

uint32_t ThisTransferTime = 0;

@@ -1470,6 +1468,7 @@ static int EmSendCmd14443aRaw(uint8_t *resp, uint16_t respLen)

bool correctionNeeded;

// Modulate Manchester

bool correctionNeeded;

// Modulate Manchester

+ LED_D_OFF();

FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_TAGSIM_MOD);

// include correction bit if necessary

FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_TAGSIM_MOD);

// include correction bit if necessary

@@ -1771,7 +1770,9 @@ int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_hi14a_card, u

if (anticollision) {

// SELECT_ALL

ReaderTransmit(sel_all, sizeof(sel_all), NULL);

if (anticollision) {

// SELECT_ALL

ReaderTransmit(sel_all, sizeof(sel_all), NULL);

- if (!ReaderReceive(resp, resp_par)) return 0;

+ if (!ReaderReceive(resp, resp_par)) {

+ return 0;

+ }

if (Demod.collisionPos) { // we had a collision and need to construct the UID bit by bit

memset(uid_resp, 0, 4);

if (Demod.collisionPos) { // we had a collision and need to construct the UID bit by bit

memset(uid_resp, 0, 4);

@@ -1793,7 +1794,9 @@ int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_hi14a_card, u

}

collision_answer_offset = uid_resp_bits%8;

ReaderTransmitBits(sel_uid, 16 + uid_resp_bits, NULL);

}

collision_answer_offset = uid_resp_bits%8;

ReaderTransmitBits(sel_uid, 16 + uid_resp_bits, NULL);

- if (!ReaderReceiveOffset(resp, collision_answer_offset, resp_par)) return 0;

+ if (!ReaderReceiveOffset(resp, collision_answer_offset, resp_par)) {

+ return 0;

+ }

}

// finally, add the last bits and BCC of the UID

for (uint16_t i = collision_answer_offset; i < (Demod.len-1)*8; i++, uid_resp_bits++) {

}

// finally, add the last bits and BCC of the UID

for (uint16_t i = collision_answer_offset; i < (Demod.len-1)*8; i++, uid_resp_bits++) {

@@ -1827,7 +1830,9 @@ int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_hi14a_card, u

ReaderTransmit(sel_uid, sizeof(sel_uid), NULL);

// Receive the SAK

ReaderTransmit(sel_uid, sizeof(sel_uid), NULL);

// Receive the SAK

- if (!ReaderReceive(resp, resp_par)) return 0;

+ if (!ReaderReceive(resp, resp_par)) {

+ return 0;

+ }

sak = resp[0];

// Test if more parts of the uid are coming

sak = resp[0];

// Test if more parts of the uid are coming

@@ -1862,7 +1867,9 @@ int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_hi14a_card, u

AppendCrc14443a(rats, 2);

ReaderTransmit(rats, sizeof(rats), NULL);

AppendCrc14443a(rats, 2);

ReaderTransmit(rats, sizeof(rats), NULL);

- if (!(len = ReaderReceive(resp, resp_par))) return 0;

+ if (!(len = ReaderReceive(resp, resp_par))) {

+ return 0;

+ }

if(p_hi14a_card) {

memcpy(p_hi14a_card->ats, resp, len);

if(p_hi14a_card) {

memcpy(p_hi14a_card->ats, resp, len);

@@ -1929,13 +1936,16 @@ b8 b7 b6 b5 b4 b3 b2 b1

b5,b6 = 00 - DESELECT

11 - WTX

b5,b6 = 00 - DESELECT

11 - WTX

-int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data, uint8_t *res) {

+int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, uint8_t *res) {

uint8_t parity[MAX_PARITY_SIZE];

uint8_t real_cmd[cmd_len + 4];

if (cmd_len) {

// ISO 14443 APDU frame: PCB [CID] [NAD] APDU CRC PCB=0x02

real_cmd[0] = 0x02; // bnr,nad,cid,chn=0; i-block(0x00)

uint8_t parity[MAX_PARITY_SIZE];

uint8_t real_cmd[cmd_len + 4];

if (cmd_len) {

// ISO 14443 APDU frame: PCB [CID] [NAD] APDU CRC PCB=0x02

real_cmd[0] = 0x02; // bnr,nad,cid,chn=0; i-block(0x00)

+ if (send_chaining) {

+ real_cmd[0] |= 0x10;

+ }

// put block number into the PCB

real_cmd[0] |= iso14_pcb_blocknum;

memcpy(real_cmd + 1, cmd, cmd_len);

// put block number into the PCB

real_cmd[0] |= iso14_pcb_blocknum;

memcpy(real_cmd + 1, cmd, cmd_len);

@@ -1955,7 +1965,7 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data, uint8_t *res) {

return 0; //DATA LINK ERROR

} else{

// S-Block WTX

return 0; //DATA LINK ERROR

} else{

// S-Block WTX

- while((data_bytes[0] & 0xF2) == 0xF2) {

+ while(len && ((data_bytes[0] & 0xF2) == 0xF2)) {

uint32_t save_iso14a_timeout = iso14a_get_timeout();

// temporarily increase timeout

iso14a_set_timeout(MAX((data_bytes[1] & 0x3f) * save_iso14a_timeout, MAX_ISO14A_TIMEOUT));

uint32_t save_iso14a_timeout = iso14a_get_timeout();

// temporarily increase timeout

iso14a_set_timeout(MAX((data_bytes[1] & 0x3f) * save_iso14a_timeout, MAX_ISO14A_TIMEOUT));

@@ -1994,12 +2004,14 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data, uint8_t *res) {

}

- // cut frame byte

- len -= 1;

- // memmove(data_bytes, data_bytes + 1, len);

- for (int i = 0; i < len; i++)

- data_bytes[i] = data_bytes[i + 1];

+ if (len) {

+ // cut frame byte

+ len -= 1;

+ // memmove(data_bytes, data_bytes + 1, len);

+ for (int i = 0; i < len; i++)

+ data_bytes[i] = data_bytes[i + 1];

+ }

return len;

}

return len;

}

@@ -2042,7 +2054,7 @@ void ReaderIso14443a(UsbCommand *c)

// 1 - all is OK with ATS, 2 - without ATS

cantSELECT = true;

}

// 1 - all is OK with ATS, 2 - without ATS

cantSELECT = true;

}

+ FpgaDisableTracing();

LED_B_ON();

cmd_send(CMD_ACK,arg0,card->uidlen,0,buf,sizeof(iso14a_card_select_t));

LED_B_OFF();

LED_B_ON();

cmd_send(CMD_ACK,arg0,card->uidlen,0,buf,sizeof(iso14a_card_select_t));

LED_B_OFF();

@@ -2055,7 +2067,8 @@ void ReaderIso14443a(UsbCommand *c)

if(param & ISO14A_APDU && !cantSELECT) {

uint8_t res;

if(param & ISO14A_APDU && !cantSELECT) {

uint8_t res;

- arg0 = iso14_apdu(cmd, len, buf, &res);

+ arg0 = iso14_apdu(cmd, len, (param & ISO14A_SEND_CHAINING), buf, &res);

+ FpgaDisableTracing();

LED_B_ON();

cmd_send(CMD_ACK, arg0, res, 0, buf, sizeof(buf));

LED_B_OFF();

LED_B_ON();

cmd_send(CMD_ACK, arg0, res, 0, buf, sizeof(buf));

LED_B_OFF();

@@ -2097,6 +2110,7 @@ void ReaderIso14443a(UsbCommand *c)

}

arg0 = ReaderReceive(buf, par);

}

arg0 = ReaderReceive(buf, par);

+ FpgaDisableTracing();

LED_B_ON();

cmd_send(CMD_ACK,arg0,0,0,buf,sizeof(buf));

LED_B_ON();

cmd_send(CMD_ACK,arg0,0,0,buf,sizeof(buf));

@@ -2413,6 +2427,8 @@ void ReaderMifare(bool first_try)

}

+ FpgaDisableTracing();

uint8_t buf[32];

memcpy(buf + 0, uid, 4);

num_to_bytes(nt, 4, buf + 4);

uint8_t buf[32];

memcpy(buf + 0, uid, 4);

num_to_bytes(nt, 4, buf + 4);

@@ -2441,6 +2457,8 @@ void RAMFUNC SniffMifare(uint8_t param) {

// C(red) A(yellow) B(green)

LEDsoff();

// C(red) A(yellow) B(green)

LEDsoff();

+ LED_A_ON();

// init trace buffer

clear_trace();

set_tracing(true);

// init trace buffer

clear_trace();

set_tracing(true);

@@ -2476,8 +2494,6 @@ void RAMFUNC SniffMifare(uint8_t param) {

// Setup for the DMA.

FpgaSetupSscDma((uint8_t *)dmaBuf, DMA_BUFFER_SIZE); // set transfer address and number of bytes. Start transfer.

// Setup for the DMA.

FpgaSetupSscDma((uint8_t *)dmaBuf, DMA_BUFFER_SIZE); // set transfer address and number of bytes. Start transfer.

- LED_D_OFF();

// init sniffer

MfSniffInit();

// init sniffer

MfSniffInit();

@@ -2489,7 +2505,6 @@ void RAMFUNC SniffMifare(uint8_t param) {

break;

}

break;

}

- LED_A_ON();

WDT_HIT();

if ((sniffCounter & 0x0000FFFF) == 0) { // from time to time

WDT_HIT();

if ((sniffCounter & 0x0000FFFF) == 0) { // from time to time

@@ -2535,15 +2550,11 @@ void RAMFUNC SniffMifare(uint8_t param) {

AT91C_BASE_PDC_SSC->PDC_RNCR = DMA_BUFFER_SIZE;

}

AT91C_BASE_PDC_SSC->PDC_RNCR = DMA_BUFFER_SIZE;

}

- LED_A_OFF();

if (sniffCounter & 0x01) {

if(!TagIsActive) { // no need to try decoding tag data if the reader is sending

uint8_t readerdata = (previous_data & 0xF0) | (*data >> 4);

if(MillerDecoding(readerdata, (sniffCounter-1)*4)) {

if (sniffCounter & 0x01) {

if(!TagIsActive) { // no need to try decoding tag data if the reader is sending

uint8_t readerdata = (previous_data & 0xF0) | (*data >> 4);

if(MillerDecoding(readerdata, (sniffCounter-1)*4)) {

- LED_B_ON();

- LED_C_OFF();

if (MfSniffLogic(receivedCmd, Uart.len, Uart.parity, Uart.bitCount, true)) break;

@@ -2559,8 +2570,6 @@ void RAMFUNC SniffMifare(uint8_t param) {

if(!ReaderIsActive) { // no need to try decoding tag data if the reader is sending

uint8_t tagdata = (previous_data << 4) | (*data & 0x0F);

if(ManchesterDecoding(tagdata, 0, (sniffCounter-1)*4)) {

if(!ReaderIsActive) { // no need to try decoding tag data if the reader is sending

uint8_t tagdata = (previous_data << 4) | (*data & 0x0F);

if(ManchesterDecoding(tagdata, 0, (sniffCounter-1)*4)) {

- LED_B_OFF();

- LED_C_ON();

if (MfSniffLogic(receivedResponse, Demod.len, Demod.parity, Demod.bitCount, false)) break;

@@ -2582,11 +2591,13 @@ void RAMFUNC SniffMifare(uint8_t param) {

} // main cycle

+ FpgaDisableTracing();

+ FpgaDisableSscDma();

+ LEDsoff();

DbpString("COMMAND FINISHED.");

- FpgaDisableSscDma();

MfSniffEnd();

Dbprintf("maxDataLen=%x, Uart.state=%x, Uart.len=%x", maxDataLen, Uart.state, Uart.len);

MfSniffEnd();

Dbprintf("maxDataLen=%x, Uart.state=%x, Uart.len=%x", maxDataLen, Uart.state, Uart.len);

- LEDsoff();

}