#include "crapto1.h"
#include "mifareutil.h"
-static uint8_t *trace = (uint8_t *) BigBuf;
-static int traceLen = 0;
-static int rsamples = 0;
-static int tracing = TRUE;
static uint32_t iso14a_timeout;
+uint8_t *trace = (uint8_t *) BigBuf;
+int traceLen = 0;
+int rsamples = 0;
+int tracing = TRUE;
+uint8_t trigger = 0;
-// CARD TO READER
+// CARD TO READER - manchester
// Sequence D: 11110000 modulation with subcarrier during first half
// Sequence E: 00001111 modulation with subcarrier during second half
// Sequence F: 00000000 no modulation with subcarrier
-// READER TO CARD
+// READER TO CARD - miller
// Sequence X: 00001100 drop after half a period
// Sequence Y: 00000000 no drop
// Sequence Z: 11000000 drop at start
#define SEC_Y 0x00
#define SEC_Z 0xc0
-static const uint8_t OddByteParity[256] = {
+const uint8_t OddByteParity[256] = {
1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1
};
-// BIG CHANGE - UNDERSTAND THIS BEFORE WE COMMIT
-#define RECV_CMD_OFFSET 3032
-#define RECV_RES_OFFSET 3096
-#define DMA_BUFFER_OFFSET 3160
-#define DMA_BUFFER_SIZE 4096
-#define TRACE_LENGTH 3000
-uint8_t trigger = 0;
void iso14a_set_trigger(int enable) {
trigger = enable;
}
+void iso14a_clear_tracelen(void) {
+ traceLen = 0;
+}
+void iso14a_set_tracing(int enable) {
+ tracing = enable;
+}
+
//-----------------------------------------------------------------------------
// Generate the parity value for a byte sequence
//
ComputeCrc14443(CRC_14443_A,data,len,data+len,data+len+1);
}
+// The function LogTrace() is also used by the iClass implementation in iClass.c
int LogTrace(const uint8_t * btBytes, int iLen, int iSamples, uint32_t dwParity, int bReader)
{
// Return when trace is full
- if (traceLen >= TRACE_LENGTH) return FALSE;
+ if (traceLen >= TRACE_SIZE) return FALSE;
// Trace the random, i'm curious
rsamples += iSamples;
static RAMFUNC int MillerDecoding(int bit)
{
- int error = 0;
+ //int error = 0;
int bitright;
if(!Uart.bitBuffer) {
// measured a drop in first and second half
// which should not be possible
Uart.state = STATE_ERROR_WAIT;
- error = 0x01;
+ //error = 0x01;
}
Uart.posCnt = 0;
if(Uart.drop == DROP_SECOND_HALF) {
// error, should not happen in SOC
Uart.state = STATE_ERROR_WAIT;
- error = 0x02;
+ //error = 0x02;
}
else {
// correct SOC
// Would be STATE_MILLER_Z
// but Z does not follow X, so error
Uart.state = STATE_ERROR_WAIT;
- error = 0x03;
+ //error = 0x03;
}
if(Uart.drop == DROP_SECOND_HALF) {
// We see a '1' and stay in state X
Uart.bitCnt = 0;
Uart.byteCnt = 0;
Uart.parityBits = 0;
- error = 0;
+ //error = 0;
}
else {
Uart.highCnt = 0;
{
int bit;
int modulation;
- int error = 0;
+ //int error = 0;
if(!Demod.buff) {
Demod.buff = 1;
case 0x01: Demod.samples = 0; break;
}
}
- error = 0;
+ //error = 0;
}
}
else {
if(Demod.state!=DEMOD_ERROR_WAIT) {
Demod.state = DEMOD_ERROR_WAIT;
Demod.output[Demod.len] = 0xaa;
- error = 0x01;
+ //error = 0x01;
}
}
else if(modulation) {
else {
Demod.output[Demod.len] = 0xab;
Demod.state = DEMOD_ERROR_WAIT;
- error = 0x02;
+ //error = 0x02;
}
break;
else {
Demod.output[Demod.len] = 0xad;
Demod.state = DEMOD_ERROR_WAIT;
- error = 0x03;
+ //error = 0x03;
}
break;
// #define RECV_RES_OFFSET 2096 // original (working as of 21/2/09) values
// #define DMA_BUFFER_OFFSET 2160 // original (working as of 21/2/09) values
// #define DMA_BUFFER_SIZE 4096 // original (working as of 21/2/09) values
-// #define TRACE_LENGTH 2000 // original (working as of 21/2/09) values
+// #define TRACE_SIZE 2000 // original (working as of 21/2/09) values
// We won't start recording the frames that we acquire until we trigger;
// a good trigger condition to get started is probably when we see a
int samples = 0;
int rsamples = 0;
- memset(trace, 0x44, RECV_CMD_OFFSET);
+ memset(trace, 0x44, TRACE_SIZE);
// Set up the demodulator for tag -> reader responses.
Demod.output = receivedResponse;
trace[traceLen++] = Uart.byteCnt;
memcpy(trace+traceLen, receivedCmd, Uart.byteCnt);
traceLen += Uart.byteCnt;
- if(traceLen > TRACE_LENGTH) break;
+ if(traceLen > TRACE_SIZE) break;
}
/* And ready to receive another command. */
Uart.state = STATE_UNSYNCD;
trace[traceLen++] = Demod.len;
memcpy(trace+traceLen, receivedResponse, Demod.len);
traceLen += Demod.len;
- if(traceLen > TRACE_LENGTH) break;
+ if(traceLen > TRACE_SIZE) break;
triggered = TRUE;
DbpString("COMMAND FINISHED");
- Dbprintf("%x %x %x", maxBehindBy, Uart.state, Uart.byteCnt);
- Dbprintf("%x %x %x", Uart.byteCntMax, traceLen, (int)Uart.output[0]);
-
done:
AT91C_BASE_PDC_SSC->PDC_PTCR = AT91C_PDC_RXTDIS;
- Dbprintf("%x %x %x", maxBehindBy, Uart.state, Uart.byteCnt);
- Dbprintf("%x %x %x", Uart.byteCntMax, traceLen, (int)Uart.output[0]);
+ Dbprintf("maxBehindBy=%x, Uart.state=%x, Uart.byteCnt=%x", maxBehindBy, Uart.state, Uart.byteCnt);
+ Dbprintf("Uart.byteCntMax=%x, traceLen=%x, Uart.output[0]=%x", Uart.byteCntMax, traceLen, (int)Uart.output[0]);
LED_A_OFF();
LED_B_OFF();
LED_C_OFF();
//-----------------------------------------------------------------------------
// Prepare tag messages
//-----------------------------------------------------------------------------
-static void CodeIso14443aAsTag(const uint8_t *cmd, int len)
+static void CodeIso14443aAsTagPar(const uint8_t *cmd, int len, uint32_t dwParity)
{
- int i;
- int oddparity;
+ int i;
- ToSendReset();
+ ToSendReset();
// Correction bit, might be removed when not needed
ToSendStuffBit(0);
ToSendStuffBit(0);
ToSendStuffBit(0);
ToSendStuffBit(0);
-
+
// Send startbit
ToSend[++ToSendMax] = SEC_D;
- for(i = 0; i < len; i++) {
- int j;
- uint8_t b = cmd[i];
+ for(i = 0; i < len; i++) {
+ int j;
+ uint8_t b = cmd[i];
// Data bits
- oddparity = 0x01;
for(j = 0; j < 8; j++) {
- oddparity ^= (b & 1);
if(b & 1) {
ToSend[++ToSendMax] = SEC_D;
} else {
ToSend[++ToSendMax] = SEC_E;
- }
- b >>= 1;
- }
+ }
+ b >>= 1;
+ }
- // Parity bit
- if(oddparity) {
- ToSend[++ToSendMax] = SEC_D;
+ // Get the parity bit
+ if ((dwParity >> i) & 0x01) {
+ ToSend[++ToSendMax] = SEC_D;
} else {
ToSend[++ToSendMax] = SEC_E;
}
- }
-
- // Send stopbit
- ToSend[++ToSendMax] = SEC_F;
-
- // Flush the buffer in FPGA!!
- for(i = 0; i < 5; i++) {
- ToSend[++ToSendMax] = SEC_F;
}
- // Convert from last byte pos to length
- ToSendMax++;
+ // Send stopbit
+ ToSend[++ToSendMax] = SEC_F;
+
+ // Convert from last byte pos to length
+ ToSendMax++;
+}
- // Add a few more for slop
- ToSend[ToSendMax++] = 0x00;
- ToSend[ToSendMax++] = 0x00;
- //ToSendMax += 2;
+static void CodeIso14443aAsTag(const uint8_t *cmd, int len){
+ CodeIso14443aAsTagPar(cmd, len, GetParity(cmd, len));
}
//-----------------------------------------------------------------------------
// This is to send a NACK kind of answer, its only 3 bits, I know it should be 4
//-----------------------------------------------------------------------------
-static void CodeStrangeAnswer()
+static void CodeStrangeAnswerAsTag()
{
int i;
// Convert from last byte pos to length
ToSendMax++;
+}
+
+static void Code4bitAnswerAsTag(uint8_t cmd)
+{
+ int i;
- // Add a few more for slop
- ToSend[ToSendMax++] = 0x00;
- ToSend[ToSendMax++] = 0x00;
- //ToSendMax += 2;
+ ToSendReset();
+
+ // Correction bit, might be removed when not needed
+ ToSendStuffBit(0);
+ ToSendStuffBit(0);
+ ToSendStuffBit(0);
+ ToSendStuffBit(0);
+ ToSendStuffBit(1); // 1
+ ToSendStuffBit(0);
+ ToSendStuffBit(0);
+ ToSendStuffBit(0);
+
+ // Send startbit
+ ToSend[++ToSendMax] = SEC_D;
+
+ uint8_t b = cmd;
+ for(i = 0; i < 4; i++) {
+ if(b & 1) {
+ ToSend[++ToSendMax] = SEC_D;
+ } else {
+ ToSend[++ToSendMax] = SEC_E;
+ }
+ b >>= 1;
+ }
+
+ // Send stopbit
+ ToSend[++ToSendMax] = SEC_F;
+
+ // Flush the buffer in FPGA!!
+ for(i = 0; i < 5; i++) {
+ ToSend[++ToSendMax] = SEC_F;
+ }
+
+ // Convert from last byte pos to length
+ ToSendMax++;
}
//-----------------------------------------------------------------------------
// Main loop of simulated tag: receive commands from reader, decide what
// response to send, and send it.
//-----------------------------------------------------------------------------
-void SimulateIso14443aTag(int tagType, int TagUid)
+void SimulateIso14443aTag(int tagType, int uid_1st, int uid_2nd)
{
+ // Enable and clear the trace
+ tracing = TRUE;
+ traceLen = 0;
+ memset(trace, 0x44, TRACE_SIZE);
+
// This function contains the tag emulation
+ uint8_t sak;
+
+ // The first response contains the ATQA (note: bytes are transmitted in reverse order).
+ uint8_t response1[2];
+
+ switch (tagType) {
+ case 1: { // MIFARE Classic
+ // Says: I am Mifare 1k - original line
+ response1[0] = 0x04;
+ response1[1] = 0x00;
+ sak = 0x08;
+ } break;
+ case 2: { // MIFARE Ultralight
+ // Says: I am a stupid memory tag, no crypto
+ response1[0] = 0x04;
+ response1[1] = 0x00;
+ sak = 0x00;
+ } break;
+ case 3: { // MIFARE DESFire
+ // Says: I am a DESFire tag, ph33r me
+ response1[0] = 0x04;
+ response1[1] = 0x03;
+ sak = 0x20;
+ } break;
+ case 4: { // ISO/IEC 14443-4
+ // Says: I am a javacard (JCOP)
+ response1[0] = 0x04;
+ response1[1] = 0x00;
+ sak = 0x28;
+ } break;
+ default: {
+ Dbprintf("Error: unkown tagtype (%d)",tagType);
+ return;
+ } break;
+ }
+
+ // The second response contains the (mandatory) first 24 bits of the UID
+ uint8_t response2[5];
+
+ // Check if the uid uses the (optional) part
+ uint8_t response2a[5];
+ if (uid_2nd) {
+ response2[0] = 0x88;
+ num_to_bytes(uid_1st,3,response2+1);
+ num_to_bytes(uid_2nd,4,response2a);
+ response2a[4] = response2a[0] ^ response2a[1] ^ response2a[2] ^ response2a[3];
+
+ // Configure the ATQA and SAK accordingly
+ response1[0] |= 0x40;
+ sak |= 0x04;
+ } else {
+ num_to_bytes(uid_1st,4,response2);
+ // Configure the ATQA and SAK accordingly
+ response1[0] &= 0xBF;
+ sak &= 0xFB;
+ }
+
+ // Calculate the BitCountCheck (BCC) for the first 4 bytes of the UID.
+ response2[4] = response2[0] ^ response2[1] ^ response2[2] ^ response2[3];
+
+ // Prepare the mandatory SAK (for 4 and 7 byte UID)
+ uint8_t response3[3];
+ response3[0] = sak;
+ ComputeCrc14443(CRC_14443_A, response3, 1, &response3[1], &response3[2]);
+
+ // Prepare the optional second SAK (for 7 byte UID), drop the cascade bit
+ uint8_t response3a[3];
+ response3a[0] = sak & 0xFB;
+ ComputeCrc14443(CRC_14443_A, response3a, 1, &response3a[1], &response3a[2]);
+
+
+/*
+ // Check if the uid uses the (optional) second part
+ if (uid_2nd) {
+ // Configure the ATQA and SAK accordingly
+ response1[0] |= 0x40;
+ sak |= 0x04;
+ }
+*/
+
+//static const uint8_t response2a[] = { 0x51, 0x48, 0x1d, 0x80, 0x84 }; // uid - cascade2 - 2nd half (4 bytes) of UID+ BCCheck
+
// Prepare protocol messages
// static const uint8_t cmd1[] = { 0x26 };
// static const uint8_t response1[] = { 0x02, 0x00 }; // Says: I am Mifare 4k - original line - greg
//
- static const uint8_t response1[] = { 0x44, 0x03 }; // Says: I am a DESFire Tag, ph33r me
+// uint8_t response1[] = { 0x44, 0x03 }; // Says: I am a DESFire Tag, ph33r me
// static const uint8_t response1[] = { 0x44, 0x00 }; // Says: I am a ULTRALITE Tag, 0wn me
// UID response
//static const uint8_t response2[] = { 0x9a, 0xe5, 0xe4, 0x43, 0xd8 }; // original value - greg
// my desfire
- static const uint8_t response2[] = { 0x88, 0x04, 0x21, 0x3f, 0x4d }; // known uid - note cascade (0x88), 2nd byte (0x04) = NXP/Phillips
+// uint8_t response2[] = { 0x88, 0x04, 0x21, 0x3f, 0x4d }; // known uid - note cascade (0x88), 2nd byte (0x04) = NXP/Phillips
// When reader selects us during cascade1 it will send cmd3
//uint8_t response3[] = { 0x04, 0x00, 0x00 }; // SAK Select (cascade1) successful response (ULTRALITE)
-uint8_t response3[] = { 0x24, 0x00, 0x00 }; // SAK Select (cascade1) successful response (DESFire)
-ComputeCrc14443(CRC_14443_A, response3, 1, &response3[1], &response3[2]);
+//uint8_t response3[] = { 0x24, 0x00, 0x00 }; // SAK Select (cascade1) successful response (DESFire)
+//ComputeCrc14443(CRC_14443_A, response3, 1, &response3[1], &response3[2]);
// send cascade2 2nd half of UID
-static const uint8_t response2a[] = { 0x51, 0x48, 0x1d, 0x80, 0x84 }; // uid - cascade2 - 2nd half (4 bytes) of UID+ BCCheck
+//static const uint8_t response2a[] = { 0x51, 0x48, 0x1d, 0x80, 0x84 }; // uid - cascade2 - 2nd half (4 bytes) of UID+ BCCheck
// NOTE : THE CRC on the above may be wrong as I have obfuscated the actual UID
// When reader selects us during cascade2 it will send cmd3a
//uint8_t response3a[] = { 0x00, 0x00, 0x00 }; // SAK Select (cascade2) successful response (ULTRALITE)
-uint8_t response3a[] = { 0x20, 0x00, 0x00 }; // SAK Select (cascade2) successful response (DESFire)
-ComputeCrc14443(CRC_14443_A, response3a, 1, &response3a[1], &response3a[2]);
+//uint8_t response3a[] = { 0x20, 0x00, 0x00 }; // SAK Select (cascade2) successful response (DESFire)
+//ComputeCrc14443(CRC_14443_A, response3a, 1, &response3a[1], &response3a[2]);
static const uint8_t response5[] = { 0x00, 0x00, 0x00, 0x00 }; // Very random tag nonce
uint8_t *resp;
int respLen;
- // Longest possible response will be 16 bytes + 2 CRC = 18 bytes
+ // Longest possible response will be 16 bytes + 2 CRC = 18 bytes
// This will need
// 144 data bits (18 * 8)
// 18 parity bits
//
// Respond with card type
- uint8_t *resp1 = (((uint8_t *)BigBuf) + 800);
+ uint8_t *resp1 = (((uint8_t *)BigBuf) + FREE_BUFFER_OFFSET);
int resp1Len;
// Anticollision cascade1 - respond with uid
- uint8_t *resp2 = (((uint8_t *)BigBuf) + 970);
+ uint8_t *resp2 = (((uint8_t *)BigBuf) + FREE_BUFFER_OFFSET + 166);
int resp2Len;
// Anticollision cascade2 - respond with 2nd half of uid if asked
int resp2aLen;
// Acknowledge select - cascade 1
- uint8_t *resp3 = (((uint8_t *)BigBuf) + 1310);
+ uint8_t *resp3 = (((uint8_t *)BigBuf) + FREE_BUFFER_OFFSET + (166*2));
int resp3Len;
// Acknowledge select - cascade 2
- uint8_t *resp3a = (((uint8_t *)BigBuf) + 1480);
+ uint8_t *resp3a = (((uint8_t *)BigBuf) + FREE_BUFFER_OFFSET + (166*3));
int resp3aLen;
// Response to a read request - not implemented atm
- uint8_t *resp4 = (((uint8_t *)BigBuf) + 1550);
+ uint8_t *resp4 = (((uint8_t *)BigBuf) + FREE_BUFFER_OFFSET + (166*4));
int resp4Len;
// Authenticate response - nonce
- uint8_t *resp5 = (((uint8_t *)BigBuf) + 1720);
+ uint8_t *resp5 = (((uint8_t *)BigBuf) + FREE_BUFFER_OFFSET + (166*5));
int resp5Len;
- uint8_t *receivedCmd = (uint8_t *)BigBuf;
+ uint8_t *receivedCmd = (((uint8_t *)BigBuf) + RECV_CMD_OFFSET);
+// uint8_t *receivedCmd = (uint8_t *)BigBuf;
int len;
- int i;
- int u;
- uint8_t b;
+ //int i;
+ //int u;
+ //uint8_t b;
// To control where we are in the protocol
int order = 0;
int happened = 0;
int happened2 = 0;
- int cmdsRecvd = 0;
+ int cmdsRecvd = 0;
+ uint8_t* respdata = NULL;
+ int respsize = 0;
+ uint8_t nack = 0x04;
- int fdt_indicator;
+ //int fdt_indicator;
- memset(receivedCmd, 0x44, 400);
+ memset(receivedCmd, 0x44, RECV_CMD_SIZE);
// Prepare the responses of the anticollision phase
// there will be not enough time to do this at the moment the reader sends it REQA
memcpy(resp3a, ToSend, ToSendMax); resp3aLen = ToSendMax;
// Strange answer is an example of rare message size (3 bits)
- CodeStrangeAnswer();
+ CodeStrangeAnswerAsTag();
memcpy(resp4, ToSend, ToSendMax); resp4Len = ToSendMax;
// Authentication answer (random nonce)
LED_A_ON();
for(;;) {
- if(!GetIso14443aCommandFromReader(receivedCmd, &len, 100)) {
+ if(!GetIso14443aCommandFromReader(receivedCmd, &len, RECV_CMD_SIZE)) {
DbpString("button press");
break;
}
// doob - added loads of debug strings so we can see what the reader is saying to us during the sim as hi14alist is not populated
// Okay, look at the command now.
lastorder = order;
- i = 1; // first byte transmitted
+ //i = 1; // first byte transmitted
if(receivedCmd[0] == 0x26) {
// Received a REQUEST
resp = resp1; respLen = resp1Len; order = 1;
+ respdata = response1;
+ respsize = sizeof(response1);
//DbpString("Hello request from reader:");
} else if(receivedCmd[0] == 0x52) {
// Received a WAKEUP
resp = resp1; respLen = resp1Len; order = 6;
// //DbpString("Wakeup request from reader:");
-
+ respdata = response1;
+ respsize = sizeof(response1);
} else if(receivedCmd[1] == 0x20 && receivedCmd[0] == 0x93) { // greg - cascade 1 anti-collision
// Received request for UID (cascade 1)
resp = resp2; respLen = resp2Len; order = 2;
// DbpString("UID (cascade 1) request from reader:");
// DbpIntegers(receivedCmd[0], receivedCmd[1], receivedCmd[2]);
-
-
+ respdata = response2;
+ respsize = sizeof(response2);
} else if(receivedCmd[1] == 0x20 && receivedCmd[0] ==0x95) { // greg - cascade 2 anti-collision
// Received request for UID (cascade 2)
resp = resp2a; respLen = resp2aLen; order = 20;
// DbpString("UID (cascade 2) request from reader:");
// DbpIntegers(receivedCmd[0], receivedCmd[1], receivedCmd[2]);
-
+ respdata = response2a;
+ respsize = sizeof(response2a);
} else if(receivedCmd[1] == 0x70 && receivedCmd[0] ==0x93) { // greg - cascade 1 select
// Received a SELECT
resp = resp3; respLen = resp3Len; order = 3;
// DbpString("Select (cascade 1) request from reader:");
// DbpIntegers(receivedCmd[0], receivedCmd[1], receivedCmd[2]);
-
+ respdata = response3;
+ respsize = sizeof(response3);
} else if(receivedCmd[1] == 0x70 && receivedCmd[0] ==0x95) { // greg - cascade 2 select
// Received a SELECT
resp = resp3a; respLen = resp3aLen; order = 30;
// DbpString("Select (cascade 2) request from reader:");
// DbpIntegers(receivedCmd[0], receivedCmd[1], receivedCmd[2]);
-
+ respdata = response3a;
+ respsize = sizeof(response3a);
} else if(receivedCmd[0] == 0x30) {
// Received a READ
resp = resp4; respLen = resp4Len; order = 4; // Do nothing
Dbprintf("Read request from reader: %x %x %x",
receivedCmd[0], receivedCmd[1], receivedCmd[2]);
-
+ respdata = &nack;
+ respsize = sizeof(nack); // 4-bit answer
} else if(receivedCmd[0] == 0x50) {
// Received a HALT
resp = resp1; respLen = 0; order = 5; // Do nothing
DbpString("Reader requested we HALT!:");
+ respdata = NULL;
+ respsize = 0;
} else if(receivedCmd[0] == 0x60) {
// Received an authentication request
resp = resp5; respLen = resp5Len; order = 7;
Dbprintf("Authenticate request from reader: %x %x %x",
receivedCmd[0], receivedCmd[1], receivedCmd[2]);
+ respdata = NULL;
+ respsize = 0;
} else if(receivedCmd[0] == 0xE0) {
// Received a RATS request
resp = resp1; respLen = 0;order = 70;
Dbprintf("RATS request from reader: %x %x %x",
receivedCmd[0], receivedCmd[1], receivedCmd[2]);
- } else {
- // Never seen this command before
- Dbprintf("Unknown command received from reader (len=%d): %x %x %x %x %x %x %x %x %x",
+ respdata = NULL;
+ respsize = 0;
+ } else {
+ // Never seen this command before
+ Dbprintf("Unknown command received from reader (len=%d): %x %x %x %x %x %x %x %x %x",
len,
receivedCmd[0], receivedCmd[1], receivedCmd[2],
receivedCmd[3], receivedCmd[4], receivedCmd[5],
receivedCmd[6], receivedCmd[7], receivedCmd[8]);
// Do not respond
resp = resp1; respLen = 0; order = 0;
- }
+ respdata = NULL;
+ respsize = 0;
+ }
// Count number of wakeups received after a halt
if(order == 6 && lastorder == 5) { happened++; }
// Look at last parity bit to determine timing of answer
if((Uart.parityBits & 0x01) || receivedCmd[0] == 0x52) {
// 1236, so correction bit needed
- i = 0;
+ //i = 0;
}
- memset(receivedCmd, 0x44, 32);
if(cmdsRecvd > 999) {
DbpString("1000 commands later...");
cmdsRecvd++;
}
- if(respLen <= 0) continue;
- //----------------------------
- u = 0;
- b = 0x00;
- fdt_indicator = FALSE;
+ if(respLen > 0) {
+ //----------------------------
+ //u = 0;
+ //b = 0x00;
+ //fdt_indicator = FALSE;
+ EmSendCmd14443aRaw(resp, respLen, receivedCmd[0] == 0x52);
+ }
+
+ if (tracing) {
+ LogTrace(receivedCmd,len, 0, Uart.parityBits, TRUE);
+ if (respdata != NULL) {
+ LogTrace(respdata,respsize, 0, SwapBits(GetParity(respdata,respsize),respsize), FALSE);
+ }
+ if(traceLen > TRACE_SIZE) {
+ DbpString("Trace full");
+ break;
+ }
+ }
- EmSendCmd14443aRaw(resp, respLen, receivedCmd[0] == 0x52);
+ memset(receivedCmd, 0x44, RECV_CMD_SIZE);
/* // Modulate Manchester
FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_TAGSIM_MOD);
AT91C_BASE_SSC->SSC_THR = 0x00;
volatile uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
if(MillerDecoding((b & 0xf0) >> 4)) {
*len = Uart.byteCnt;
+ if (tracing) LogTrace(received, *len, GetDeltaCountUS(), Uart.parityBits, TRUE);
return 0;
}
if(MillerDecoding(b & 0x0f)) {
*len = Uart.byteCnt;
+ if (tracing) LogTrace(received, *len, GetDeltaCountUS(), Uart.parityBits, TRUE);
return 0;
}
}
}
if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
if(i > respLen) {
- b = 0x00;
+ b = 0xff; // was 0x00
u++;
} else {
b = resp[i];
return 0;
}
-static int EmSendCmdEx(uint8_t *resp, int respLen, int correctionNeeded){
- CodeIso14443aAsTag(resp, respLen);
- return EmSendCmd14443aRaw(ToSend, ToSendMax, correctionNeeded);
+int EmSend4bitEx(uint8_t resp, int correctionNeeded){
+ Code4bitAnswerAsTag(resp);
+ int res = EmSendCmd14443aRaw(ToSend, ToSendMax, correctionNeeded);
+ if (tracing) LogTrace(&resp, 1, GetDeltaCountUS(), GetParity(&resp, 1), FALSE);
+ return res;
+}
+
+int EmSend4bit(uint8_t resp){
+ return EmSend4bitEx(resp, 0);
}
-static int EmSendCmd(uint8_t *resp, int respLen){
- return EmSendCmdEx(resp, respLen, 0);
+int EmSendCmdExPar(uint8_t *resp, int respLen, int correctionNeeded, uint32_t par){
+ CodeIso14443aAsTagPar(resp, respLen, par);
+ int res = EmSendCmd14443aRaw(ToSend, ToSendMax, correctionNeeded);
+ if (tracing) LogTrace(resp, respLen, GetDeltaCountUS(), par, FALSE);
+ return res;
+}
+
+int EmSendCmdEx(uint8_t *resp, int respLen, int correctionNeeded){
+ return EmSendCmdExPar(resp, respLen, correctionNeeded, GetParity(resp, respLen));
+}
+
+int EmSendCmd(uint8_t *resp, int respLen){
+ return EmSendCmdExPar(resp, respLen, 0, GetParity(resp, respLen));
+}
+
+int EmSendCmdPar(uint8_t *resp, int respLen, uint32_t par){
+ return EmSendCmdExPar(resp, respLen, 0, par);
}
//-----------------------------------------------------------------------------
byte_t nt_diff = 0;
LED_A_OFF();
byte_t par = 0;
- byte_t par_mask = 0xff;
+ //byte_t par_mask = 0xff;
byte_t par_low = 0;
int led_on = TRUE;
uint8_t uid[8];
{
if ( (parameter != 0) && (memcmp(nt, nt_noattack, 4) == 0) ) continue;
- isNULL = (nt_attacked[0] = 0) && (nt_attacked[1] = 0) && (nt_attacked[2] = 0) && (nt_attacked[3] = 0);
+ isNULL = (nt_attacked[0] == 0) && (nt_attacked[1] == 0) && (nt_attacked[2] == 0) && (nt_attacked[3] == 0);
if ( (isNULL != 0 ) && (memcmp(nt, nt_attacked, 4) != 0) ) continue;
if (nt_diff == 0)
{
LED_A_ON();
memcpy(nt_attacked, nt, 4);
- par_mask = 0xf8;
+ //par_mask = 0xf8;
par_low = par & 0x07;
}
if (MF_DBGLEVEL >= 1) DbpString("COMMAND mifare FINISHED");
}
+
//-----------------------------------------------------------------------------
-// Select, Authenticaate, Read an MIFARE tag.
-// read block
+// MIFARE 1K simulate.
+//
//-----------------------------------------------------------------------------
-void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
+void Mifare1ksim(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
{
- // params
- uint8_t blockNo = arg0;
- uint8_t keyType = arg1;
- uint64_t ui64Key = 0;
- ui64Key = bytes_to_num(datain, 6);
-
- // variables
- byte_t isOK = 0;
- byte_t dataoutbuf[16];
- uint8_t uid[8];
- uint32_t cuid;
+ int cardSTATE = MFEMUL_NOFIELD;
+ int _7BUID = 0;
+ int vHf = 0; // in mV
+ //int nextCycleTimeout = 0;
+ int res;
+// uint32_t timer = 0;
+ uint32_t selTimer = 0;
+ uint32_t authTimer = 0;
+ uint32_t par = 0;
+ int len = 0;
+ uint8_t cardWRBL = 0;
+ uint8_t cardAUTHSC = 0;
+ uint8_t cardAUTHKEY = 0xff; // no authentication
+ //uint32_t cardRn = 0;
+ uint32_t cardRr = 0;
+ uint32_t cuid = 0;
+ //uint32_t rn_enc = 0;
+ uint32_t ans = 0;
+ uint32_t cardINTREG = 0;
+ uint8_t cardINTBLOCK = 0;
struct Crypto1State mpcs = {0, 0};
struct Crypto1State *pcs;
pcs = &mpcs;
-
- // clear trace
- traceLen = 0;
-// tracing = false;
-
- iso14443a_setup();
-
- LED_A_ON();
- LED_B_OFF();
- LED_C_OFF();
-
- while (true) {
- if(!iso14443a_select_card(uid, NULL, &cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
- break;
- };
-
- if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Auth error");
- break;
- };
-
- if(mifare_classic_readblock(pcs, cuid, blockNo, dataoutbuf)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Read block error");
- break;
- };
-
- if(mifare_classic_halt(pcs, cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
- break;
- };
-
- isOK = 1;
- break;
- }
- // ----------------------------- crypto1 destroy
- crypto1_destroy(pcs);
+ uint8_t* receivedCmd = eml_get_bigbufptr_recbuf();
+ uint8_t *response = eml_get_bigbufptr_sendbuf();
- if (MF_DBGLEVEL >= 2) DbpString("READ BLOCK FINISHED");
-
- // add trace trailer
- uid[0] = 0xff;
- uid[1] = 0xff;
- uid[2] = 0xff;
- uid[3] = 0xff;
- LogTrace(uid, 4, 0, 0, TRUE);
-
- UsbCommand ack = {CMD_ACK, {isOK, 0, 0}};
- memcpy(ack.d.asBytes, dataoutbuf, 16);
-
- LED_B_ON();
- UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
- LED_B_OFF();
+ static uint8_t rATQA[] = {0x04, 0x00}; // Mifare classic 1k 4BUID
+ static uint8_t rUIDBCC1[] = {0xde, 0xad, 0xbe, 0xaf, 0x62};
+ static uint8_t rUIDBCC2[] = {0xde, 0xad, 0xbe, 0xaf, 0x62}; // !!!
+
+ static uint8_t rSAK[] = {0x08, 0xb6, 0xdd};
+ static uint8_t rSAK1[] = {0x04, 0xda, 0x17};
- // Thats it...
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
- LEDsoff();
-// tracing = TRUE;
+ static uint8_t rAUTH_NT[] = {0x01, 0x02, 0x03, 0x04};
+// static uint8_t rAUTH_NT[] = {0x1a, 0xac, 0xff, 0x4f};
+ static uint8_t rAUTH_AT[] = {0x00, 0x00, 0x00, 0x00};
-}
+ // clear trace
+ traceLen = 0;
+ tracing = true;
-//-----------------------------------------------------------------------------
-// Select, Authenticaate, Read an MIFARE tag.
-// read sector (data = 4 x 16 bytes = 64 bytes)
-//-----------------------------------------------------------------------------
-void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
-{
- // params
- uint8_t sectorNo = arg0;
- uint8_t keyType = arg1;
- uint64_t ui64Key = 0;
- ui64Key = bytes_to_num(datain, 6);
+ // Authenticate response - nonce
+ uint32_t nonce = bytes_to_num(rAUTH_NT, 4);
- // variables
- byte_t isOK = 0;
- byte_t dataoutbuf[16 * 4];
- uint8_t uid[8];
- uint32_t cuid;
- struct Crypto1State mpcs = {0, 0};
- struct Crypto1State *pcs;
- pcs = &mpcs;
+ // get UID from emul memory
+ emlGetMemBt(receivedCmd, 7, 1);
+ _7BUID = !(receivedCmd[0] == 0x00);
+ if (!_7BUID) { // ---------- 4BUID
+ rATQA[0] = 0x04;
+
+ emlGetMemBt(rUIDBCC1, 0, 4);
+ rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
+ } else { // ---------- 7BUID
+ rATQA[0] = 0x44;
+
+ rUIDBCC1[0] = 0x88;
+ emlGetMemBt(&rUIDBCC1[1], 0, 3);
+ rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
+ emlGetMemBt(rUIDBCC2, 3, 4);
+ rUIDBCC2[4] = rUIDBCC2[0] ^ rUIDBCC2[1] ^ rUIDBCC2[2] ^ rUIDBCC2[3];
+ }
- // clear trace
- traceLen = 0;
-// tracing = false;
+// -------------------------------------- test area
- iso14443a_setup();
+// -------------------------------------- END test area
+ // start mkseconds counter
+ StartCountUS();
- LED_A_ON();
- LED_B_OFF();
- LED_C_OFF();
+ // We need to listen to the high-frequency, peak-detected path.
+ SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
+ FpgaSetupSsc();
+
+ FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_TAGSIM_LISTEN);
+ SpinDelay(200);
+ if (MF_DBGLEVEL >= 1) Dbprintf("Started. 7buid=%d", _7BUID);
+ // calibrate mkseconds counter
+ GetDeltaCountUS();
while (true) {
- if(!iso14443a_select_card(uid, NULL, &cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
- break;
- };
+ WDT_HIT();
- if(mifare_classic_auth(pcs, cuid, sectorNo * 4, keyType, ui64Key, AUTH_FIRST)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Auth error");
+ if(BUTTON_PRESS()) {
break;
- };
+ }
+
+ // find reader field
+ // Vref = 3300mV, and an 10:1 voltage divider on the input
+ // can measure voltages up to 33000 mV
+ if (cardSTATE == MFEMUL_NOFIELD) {
+ vHf = (33000 * AvgAdc(ADC_CHAN_HF)) >> 10;
+ if (vHf > MF_MINFIELDV) {
+ cardSTATE_TO_IDLE();
+ LED_A_ON();
+ }
+ }
+
+ if (cardSTATE != MFEMUL_NOFIELD) {
+ res = EmGetCmd(receivedCmd, &len, RECV_CMD_SIZE); // (+ nextCycleTimeout)
+ if (res == 2) {
+ cardSTATE = MFEMUL_NOFIELD;
+ LEDsoff();
+ continue;
+ }
+ if(res) break;
+ }
- if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 0, dataoutbuf + 16 * 0)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Read block 0 error");
- break;
- };
- if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 1, dataoutbuf + 16 * 1)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Read block 1 error");
- break;
- };
- if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 2, dataoutbuf + 16 * 2)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Read block 2 error");
- break;
- };
- if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 3, dataoutbuf + 16 * 3)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Read block 3 error");
- break;
- };
+ //nextCycleTimeout = 0;
- if(mifare_classic_halt(pcs, cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
- break;
- };
+// if (len) Dbprintf("len:%d cmd: %02x %02x %02x %02x", len, receivedCmd[0], receivedCmd[1], receivedCmd[2], receivedCmd[3]);
- isOK = 1;
- break;
- }
-
- // ----------------------------- crypto1 destroy
- crypto1_destroy(pcs);
-
- if (MF_DBGLEVEL >= 2) DbpString("READ SECTOR FINISHED");
+ if (len != 4 && cardSTATE != MFEMUL_NOFIELD) { // len != 4 <---- speed up the code 4 authentication
+ // REQ or WUP request in ANY state and WUP in HALTED state
+ if (len == 1 && ((receivedCmd[0] == 0x26 && cardSTATE != MFEMUL_HALTED) || receivedCmd[0] == 0x52)) {
+ selTimer = GetTickCount();
+ EmSendCmdEx(rATQA, sizeof(rATQA), (receivedCmd[0] == 0x52));
+ cardSTATE = MFEMUL_SELECT1;
+
+ // init crypto block
+ LED_B_OFF();
+ LED_C_OFF();
+ crypto1_destroy(pcs);
+ cardAUTHKEY = 0xff;
+ }
+ }
+
+ switch (cardSTATE) {
+ case MFEMUL_NOFIELD:{
+ break;
+ }
+ case MFEMUL_HALTED:{
+ break;
+ }
+ case MFEMUL_IDLE:{
+ break;
+ }
+ case MFEMUL_SELECT1:{
+ // select all
+ if (len == 2 && (receivedCmd[0] == 0x93 && receivedCmd[1] == 0x20)) {
+ EmSendCmd(rUIDBCC1, sizeof(rUIDBCC1));
+ break;
+ }
- // add trace trailer
- uid[0] = 0xff;
- uid[1] = 0xff;
- uid[2] = 0xff;
- uid[3] = 0xff;
- LogTrace(uid, 4, 0, 0, TRUE);
+ // select card
+ if (len == 9 &&
+ (receivedCmd[0] == 0x93 && receivedCmd[1] == 0x70 && memcmp(&receivedCmd[2], rUIDBCC1, 4) == 0)) {
+ if (!_7BUID)
+ EmSendCmd(rSAK, sizeof(rSAK));
+ else
+ EmSendCmd(rSAK1, sizeof(rSAK1));
- UsbCommand ack = {CMD_ACK, {isOK, 0, 0}};
- memcpy(ack.d.asBytes, dataoutbuf, 16 * 2);
-
- LED_B_ON();
- UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
+ cuid = bytes_to_num(rUIDBCC1, 4);
+ if (!_7BUID) {
+ cardSTATE = MFEMUL_WORK;
+ LED_B_ON();
+ if (MF_DBGLEVEL >= 4) Dbprintf("--> WORK. anticol1 time: %d", GetTickCount() - selTimer);
+ break;
+ } else {
+ cardSTATE = MFEMUL_SELECT2;
+ break;
+ }
+ }
+
+ break;
+ }
+ case MFEMUL_SELECT2:{
+ if (!len) break;
+
+ if (len == 2 && (receivedCmd[0] == 0x95 && receivedCmd[1] == 0x20)) {
+ EmSendCmd(rUIDBCC2, sizeof(rUIDBCC2));
+ break;
+ }
- SpinDelay(100);
-
- memcpy(ack.d.asBytes, dataoutbuf + 16 * 2, 16 * 2);
- UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
- LED_B_OFF();
-
- // Thats it...
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
- LEDsoff();
-// tracing = TRUE;
-
-}
-
-//-----------------------------------------------------------------------------
-// Select, Authenticaate, Read an MIFARE tag.
-// read block
-//-----------------------------------------------------------------------------
-void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
-{
- // params
- uint8_t blockNo = arg0;
- uint8_t keyType = arg1;
- uint64_t ui64Key = 0;
- byte_t blockdata[16];
-
- ui64Key = bytes_to_num(datain, 6);
- memcpy(blockdata, datain + 10, 16);
-
- // variables
- byte_t isOK = 0;
- uint8_t uid[8];
- uint32_t cuid;
- struct Crypto1State mpcs = {0, 0};
- struct Crypto1State *pcs;
- pcs = &mpcs;
-
- // clear trace
- traceLen = 0;
-// tracing = false;
-
- iso14443a_setup();
-
- LED_A_ON();
- LED_B_OFF();
- LED_C_OFF();
-
- while (true) {
- if(!iso14443a_select_card(uid, NULL, &cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
- break;
- };
-
- if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Auth error");
- break;
- };
-
- if(mifare_classic_writeblock(pcs, cuid, blockNo, blockdata)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
- break;
- };
-
- if(mifare_classic_halt(pcs, cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
- break;
- };
-
- isOK = 1;
- break;
- }
-
- // ----------------------------- crypto1 destroy
- crypto1_destroy(pcs);
-
- if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
-
- // add trace trailer
- uid[0] = 0xff;
- uid[1] = 0xff;
- uid[2] = 0xff;
- uid[3] = 0xff;
- LogTrace(uid, 4, 0, 0, TRUE);
-
- UsbCommand ack = {CMD_ACK, {isOK, 0, 0}};
-
- LED_B_ON();
- UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
- LED_B_OFF();
-
-
- // Thats it...
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
- LEDsoff();
-// tracing = TRUE;
-
-}
-
-// Return 1 if the nonce is invalid else return 0
-int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, byte_t * parity) {
- return ((oddparity((Nt >> 24) & 0xFF) == ((parity[0]) ^ oddparity((NtEnc >> 24) & 0xFF) ^ BIT(Ks1,16))) & \
- (oddparity((Nt >> 16) & 0xFF) == ((parity[1]) ^ oddparity((NtEnc >> 16) & 0xFF) ^ BIT(Ks1,8))) & \
- (oddparity((Nt >> 8) & 0xFF) == ((parity[2]) ^ oddparity((NtEnc >> 8) & 0xFF) ^ BIT(Ks1,0)))) ? 1 : 0;
-}
-
-
-//-----------------------------------------------------------------------------
-// MIFARE nested authentication.
-//
-//-----------------------------------------------------------------------------
-void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
-{
- // params
- uint8_t blockNo = arg0;
- uint8_t keyType = arg1;
- uint8_t targetBlockNo = arg2 & 0xff;
- uint8_t targetKeyType = (arg2 >> 8) & 0xff;
- uint64_t ui64Key = 0;
-
- ui64Key = bytes_to_num(datain, 6);
-
- // variables
- int rtr, i, j, m, len;
- int davg, dmin, dmax;
- uint8_t uid[8];
- uint32_t cuid, nt1, nt2, nttmp, nttest, par, ks1;
- uint8_t par_array[4];
- nestedVector nvector[NES_MAX_INFO + 1][10];
- int nvectorcount[NES_MAX_INFO + 1];
- int ncount = 0;
- UsbCommand ack = {CMD_ACK, {0, 0, 0}};
- struct Crypto1State mpcs = {0, 0};
- struct Crypto1State *pcs;
- pcs = &mpcs;
- uint8_t* receivedAnswer = mifare_get_bigbufptr();
-
- //init
- for (i = 0; i < NES_MAX_INFO + 1; i++) nvectorcount[i] = 11; // 11 - empty block;
-
- // clear trace
- traceLen = 0;
- tracing = false;
-
- iso14443a_setup();
-
- LED_A_ON();
- LED_B_ON();
- LED_C_OFF();
-
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
- SpinDelay(200);
-
- davg = dmax = 0;
- dmin = 2000;
-
- // test nonce distance
- for (rtr = 0; rtr < 10; rtr++) {
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
- SpinDelay(100);
- FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
-
- // Test if the action was cancelled
- if(BUTTON_PRESS()) {
- break;
- }
-
- if(!iso14443a_select_card(uid, NULL, &cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
- break;
- };
-
- if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Auth1 error");
- break;
- };
-
- if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_NESTED, &nt2)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Auth2 error");
- break;
- };
-
- nttmp = prng_successor(nt1, 500);
- for (i = 501; i < 2000; i++) {
- nttmp = prng_successor(nttmp, 1);
- if (nttmp == nt2) break;
- }
-
- if (i != 2000) {
- davg += i;
- if (dmin > i) dmin = i;
- if (dmax < i) dmax = i;
- if (MF_DBGLEVEL >= 4) Dbprintf("r=%d nt1=%08x nt2=%08x distance=%d", rtr, nt1, nt2, i);
- }
- }
-
- if (rtr == 0) return;
-
- davg = davg / rtr;
- if (MF_DBGLEVEL >= 3) Dbprintf("distance: min=%d max=%d avg=%d", dmin, dmax, davg);
-
- LED_B_OFF();
-
-// -------------------------------------------------------------------------------------------------
-
- LED_C_ON();
-
- // get crypted nonces for target sector
- for (rtr = 0; rtr < NS_RETRIES_GETNONCE; rtr++) {
- if (MF_DBGLEVEL >= 4) Dbprintf("------------------------------");
-
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
- SpinDelay(100);
- FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
-
- // Test if the action was cancelled
- if(BUTTON_PRESS()) {
- break;
- }
-
- if(!iso14443a_select_card(uid, NULL, &cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
- break;
- };
-
- if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Auth1 error");
- break;
- };
-
- // nested authentication
- len = mifare_sendcmd_shortex(pcs, AUTH_NESTED, 0x60 + (targetKeyType & 0x01), targetBlockNo, receivedAnswer, &par);
- if (len != 4) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Auth2 error len=%d", len);
- break;
- };
-
- nt2 = bytes_to_num(receivedAnswer, 4);
- if (MF_DBGLEVEL >= 4) Dbprintf("r=%d nt1=%08x nt2enc=%08x nt2par=%08x", rtr, nt1, nt2, par);
-
- // Parity validity check
- for (i = 0; i < 4; i++) {
- par_array[i] = (oddparity(receivedAnswer[i]) != ((par & 0x08) >> 3));
- par = par << 1;
- }
-
- ncount = 0;
- for (m = dmin - NS_TOLERANCE; m < dmax + NS_TOLERANCE; m++) {
- nttest = prng_successor(nt1, m);
- ks1 = nt2 ^ nttest;
-
- if (valid_nonce(nttest, nt2, ks1, par_array) && (ncount < 11)){
-
- nvector[NES_MAX_INFO][ncount].nt = nttest;
- nvector[NES_MAX_INFO][ncount].ks1 = ks1;
- ncount++;
- nvectorcount[NES_MAX_INFO] = ncount;
- if (MF_DBGLEVEL >= 4) Dbprintf("valid m=%d ks1=%08x nttest=%08x", m, ks1, nttest);
- }
+ // select 2 card
+ if (len == 9 &&
+ (receivedCmd[0] == 0x95 && receivedCmd[1] == 0x70 && memcmp(&receivedCmd[2], rUIDBCC2, 4) == 0)) {
+ EmSendCmd(rSAK, sizeof(rSAK));
- }
-
- // select vector with length less than got
- if (nvectorcount[NES_MAX_INFO] != 0) {
- m = NES_MAX_INFO;
-
- for (i = 0; i < NES_MAX_INFO; i++)
- if (nvectorcount[i] > 10) {
- m = i;
+ cuid = bytes_to_num(rUIDBCC2, 4);
+ cardSTATE = MFEMUL_WORK;
+ LED_B_ON();
+ if (MF_DBGLEVEL >= 4) Dbprintf("--> WORK. anticol2 time: %d", GetTickCount() - selTimer);
break;
}
- if (m == NES_MAX_INFO)
- for (i = 0; i < NES_MAX_INFO; i++)
- if (nvectorcount[NES_MAX_INFO] < nvectorcount[i]) {
- m = i;
+ // i guess there is a command). go into the work state.
+ if (len != 4) break;
+ cardSTATE = MFEMUL_WORK;
+ goto lbWORK;
+ }
+ case MFEMUL_AUTH1:{
+ if (len == 8) {
+ // --- crypto
+ //rn_enc = bytes_to_num(receivedCmd, 4);
+ //cardRn = rn_enc ^ crypto1_word(pcs, rn_enc , 1);
+ cardRr = bytes_to_num(&receivedCmd[4], 4) ^ crypto1_word(pcs, 0, 0);
+ // test if auth OK
+ if (cardRr != prng_successor(nonce, 64)){
+ if (MF_DBGLEVEL >= 4) Dbprintf("AUTH FAILED. cardRr=%08x, succ=%08x", cardRr, prng_successor(nonce, 64));
+ cardSTATE_TO_IDLE();
break;
}
-
- if (m != NES_MAX_INFO) {
- for (i = 0; i < nvectorcount[m]; i++) {
- nvector[m][i] = nvector[NES_MAX_INFO][i];
+ ans = prng_successor(nonce, 96) ^ crypto1_word(pcs, 0, 0);
+ num_to_bytes(ans, 4, rAUTH_AT);
+ // --- crypto
+ EmSendCmd(rAUTH_AT, sizeof(rAUTH_AT));
+ cardSTATE = MFEMUL_AUTH2;
+ } else {
+ cardSTATE_TO_IDLE();
}
- nvectorcount[m] = nvectorcount[NES_MAX_INFO];
- }
- }
- }
-
- LED_C_OFF();
-
- // ----------------------------- crypto1 destroy
- crypto1_destroy(pcs);
-
- // add trace trailer
- uid[0] = 0xff;
- uid[1] = 0xff;
- uid[2] = 0xff;
- uid[3] = 0xff;
- LogTrace(uid, 4, 0, 0, TRUE);
-
- for (i = 0; i < NES_MAX_INFO; i++) {
- if (nvectorcount[i] > 10) continue;
-
- for (j = 0; j < nvectorcount[i]; j += 5) {
- ncount = nvectorcount[i] - j;
- if (ncount > 5) ncount = 5;
-
- ack.arg[0] = 0; // isEOF = 0
- ack.arg[1] = ncount;
- ack.arg[2] = targetBlockNo + (targetKeyType * 0x100);
- memset(ack.d.asBytes, 0x00, sizeof(ack.d.asBytes));
-
- memcpy(ack.d.asBytes, &cuid, 4);
- for (m = 0; m < ncount; m++) {
- memcpy(ack.d.asBytes + 8 + m * 8 + 0, &nvector[i][m + j].nt, 4);
- memcpy(ack.d.asBytes + 8 + m * 8 + 4, &nvector[i][m + j].ks1, 4);
- }
-
- LED_B_ON();
- SpinDelay(100);
- UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
- LED_B_OFF();
- }
- }
-
- // finalize list
- ack.arg[0] = 1; // isEOF = 1
- ack.arg[1] = 0;
- ack.arg[2] = 0;
- memset(ack.d.asBytes, 0x00, sizeof(ack.d.asBytes));
-
- LED_B_ON();
- SpinDelay(300);
- UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
- LED_B_OFF();
-
- if (MF_DBGLEVEL >= 4) DbpString("NESTED FINISHED");
-
- // Thats it...
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
- LEDsoff();
-
- tracing = TRUE;
-}
-
-//-----------------------------------------------------------------------------
-// MIFARE check keys. key count up to 8.
-//
-//-----------------------------------------------------------------------------
-void MifareChkKeys(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
-{
- // params
- uint8_t blockNo = arg0;
- uint8_t keyType = arg1;
- uint8_t keyCount = arg2;
- uint64_t ui64Key = 0;
-
- // variables
- int i;
- byte_t isOK = 0;
- uint8_t uid[8];
- uint32_t cuid;
- struct Crypto1State mpcs = {0, 0};
- struct Crypto1State *pcs;
- pcs = &mpcs;
-
- // clear debug level
- int OLD_MF_DBGLEVEL = MF_DBGLEVEL;
- MF_DBGLEVEL = MF_DBG_NONE;
-
- // clear trace
- traceLen = 0;
- tracing = TRUE;
-
- iso14443a_setup();
-
- LED_A_ON();
- LED_B_OFF();
- LED_C_OFF();
-
- SpinDelay(300);
- for (i = 0; i < keyCount; i++) {
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
- SpinDelay(100);
- FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
-
- if(!iso14443a_select_card(uid, NULL, &cuid)) {
- if (OLD_MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
- break;
- };
-
- ui64Key = bytes_to_num(datain + i * 6, 6);
- if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {
- continue;
- };
-
- isOK = 1;
- break;
- }
-
- // ----------------------------- crypto1 destroy
- crypto1_destroy(pcs);
-
- // add trace trailer
- uid[0] = 0xff;
- uid[1] = 0xff;
- uid[2] = 0xff;
- uid[3] = 0xff;
- LogTrace(uid, 4, 0, 0, TRUE);
-
- UsbCommand ack = {CMD_ACK, {isOK, 0, 0}};
- if (isOK) memcpy(ack.d.asBytes, datain + i * 6, 6);
-
- LED_B_ON();
- UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
- LED_B_OFF();
-
- // Thats it...
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
- LEDsoff();
-
- // restore debug level
- MF_DBGLEVEL = OLD_MF_DBGLEVEL;
-}
-
-//-----------------------------------------------------------------------------
-// MIFARE 1K simulate.
-//
-//-----------------------------------------------------------------------------
-void Mifare1ksim(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
-{
- int cardSTATE = MFEMUL_NOFIELD;
- int vHf = 0; // in mV
- int res;
- uint32_t timer = 0;
- int len = 0;
- uint8_t cardAUTHSC = 0;
- uint8_t cardAUTHKEY = 0xff; // no authentication
- uint32_t cuid = 0;
- struct Crypto1State mpcs = {0, 0};
- struct Crypto1State *pcs;
- pcs = &mpcs;
-
- uint64_t key64 = 0xffffffffffffULL;
-
- uint8_t* receivedCmd = mifare_get_bigbufptr();
-
- static uint8_t rATQA[] = {0x04, 0x00}; // Mifare classic 1k
-
- static uint8_t rUIDBCC1[] = {0xde, 0xad, 0xbe, 0xaf, 0x62};
- static uint8_t rUIDBCC2[] = {0xde, 0xad, 0xbe, 0xaf, 0x62}; // !!!
-
- static uint8_t rSAK[] = {0x08, 0xb6, 0xdd};
-
- static uint8_t rAUTH_NT[] = {0x01, 0x02, 0x03, 0x04};
-
-// -------------------------------------- test area
-
-
-// -------------------------------------- END test area
-
- // We need to listen to the high-frequency, peak-detected path.
- SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
- FpgaSetupSsc();
-
- FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_TAGSIM_LISTEN);
- SpinDelay(200);
-
-Dbprintf("--> start");
- while (true) {
- WDT_HIT();
-// timer = GetTickCount();
-// Dbprintf("time: %d", GetTickCount() - timer);
-
- // find reader field
- // Vref = 3300mV, and an 10:1 voltage divider on the input
- // can measure voltages up to 33000 mV
- if (cardSTATE == MFEMUL_NOFIELD) {
- vHf = (33000 * AvgAdc(ADC_CHAN_HF)) >> 10;
- if (vHf > MF_MINFIELDV) {
- cardSTATE = MFEMUL_IDLE;
- LED_A_ON();
+ if (cardSTATE != MFEMUL_AUTH2) break;
}
- }
-
- if (cardSTATE != MFEMUL_NOFIELD) {
- res = EmGetCmd(receivedCmd, &len, 100);
- if (res == 2) {
- cardSTATE = MFEMUL_NOFIELD;
- LEDsoff();
- continue;
- }
- if(res) break;
- }
-
- if(BUTTON_PRESS()) {
- break;
- }
-
-// if (len) Dbprintf("len:%d cmd: %02x %02x %02x %02x", len, receivedCmd[0], receivedCmd[1], receivedCmd[2], receivedCmd[3]);
-
- switch (cardSTATE) {
- case MFEMUL_NOFIELD:{
+ case MFEMUL_AUTH2:{
+ LED_C_ON();
+ cardSTATE = MFEMUL_WORK;
+ if (MF_DBGLEVEL >= 4) Dbprintf("AUTH COMPLETED. sec=%d, key=%d time=%d", cardAUTHSC, cardAUTHKEY, GetTickCount() - authTimer);
break;
}
- case MFEMUL_HALTED:{
- // WUP request
- if (!(len == 1 && receivedCmd[0] == 0x52)) break;
- }
- case MFEMUL_IDLE:{
- // REQ or WUP request
- if (len == 1 && (receivedCmd[0] == 0x26 || receivedCmd[0] == 0x52)) {
-timer = GetTickCount();
- EmSendCmdEx(rATQA, sizeof(rATQA), (receivedCmd[0] == 0x52));
- cardSTATE = MFEMUL_SELECT1;
+ case MFEMUL_WORK:{
+lbWORK: if (len == 0) break;
+
+ if (cardAUTHKEY == 0xff) {
+ // first authentication
+ if (len == 4 && (receivedCmd[0] == 0x60 || receivedCmd[0] == 0x61)) {
+ authTimer = GetTickCount();
+
+ cardAUTHSC = receivedCmd[1] / 4; // received block num
+ cardAUTHKEY = receivedCmd[0] - 0x60;
+
+ // --- crypto
+ crypto1_create(pcs, emlGetKey(cardAUTHSC, cardAUTHKEY));
+ ans = nonce ^ crypto1_word(pcs, cuid ^ nonce, 0);
+ num_to_bytes(nonce, 4, rAUTH_AT);
+ EmSendCmd(rAUTH_AT, sizeof(rAUTH_AT));
+ // --- crypto
+
+// last working revision
+// EmSendCmd14443aRaw(resp1, resp1Len, 0);
+// LogTrace(NULL, 0, GetDeltaCountUS(), 0, true);
+
+ cardSTATE = MFEMUL_AUTH1;
+ //nextCycleTimeout = 10;
+ break;
+ }
+ } else {
+ // decrypt seqence
+ mf_crypto1_decrypt(pcs, receivedCmd, len);
- // init crypto block
- crypto1_destroy(pcs);
- cardAUTHKEY = 0xff;
+ // nested authentication
+ if (len == 4 && (receivedCmd[0] == 0x60 || receivedCmd[0] == 0x61)) {
+ authTimer = GetTickCount();
+
+ cardAUTHSC = receivedCmd[1] / 4; // received block num
+ cardAUTHKEY = receivedCmd[0] - 0x60;
+
+ // --- crypto
+ crypto1_create(pcs, emlGetKey(cardAUTHSC, cardAUTHKEY));
+ ans = nonce ^ crypto1_word(pcs, cuid ^ nonce, 0);
+ num_to_bytes(ans, 4, rAUTH_AT);
+ EmSendCmd(rAUTH_AT, sizeof(rAUTH_AT));
+ // --- crypto
+
+ cardSTATE = MFEMUL_AUTH1;
+ //nextCycleTimeout = 10;
+ break;
+ }
}
- break;
- }
- case MFEMUL_SELECT1:{
- // select all
- if (len == 2 && (receivedCmd[0] == 0x93 && receivedCmd[1] == 0x20)) {
- EmSendCmd(rUIDBCC1, sizeof(rUIDBCC1));
-
- if (rUIDBCC1[0] == 0x88) {
- cardSTATE = MFEMUL_SELECT2;
+
+ // rule 13 of 7.5.3. in ISO 14443-4. chaining shall be continued
+ // BUT... ACK --> NACK
+ if (len == 1 && receivedCmd[0] == CARD_ACK) {
+ EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+ break;
+ }
+
+ // rule 12 of 7.5.3. in ISO 14443-4. R(NAK) --> R(ACK)
+ if (len == 1 && receivedCmd[0] == CARD_NACK_NA) {
+ EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
+ break;
+ }
+
+ // read block
+ if (len == 4 && receivedCmd[0] == 0x30) {
+ if (receivedCmd[1] >= 16 * 4 || receivedCmd[1] / 4 != cardAUTHSC) {
+ EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+ break;
+ }
+ emlGetMem(response, receivedCmd[1], 1);
+ AppendCrc14443a(response, 16);
+ mf_crypto1_encrypt(pcs, response, 18, &par);
+ EmSendCmdPar(response, 18, par);
+ break;
+ }
+
+ // write block
+ if (len == 4 && receivedCmd[0] == 0xA0) {
+ if (receivedCmd[1] >= 16 * 4 || receivedCmd[1] / 4 != cardAUTHSC) {
+ EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+ break;
+ }
+ EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
+ //nextCycleTimeout = 50;
+ cardSTATE = MFEMUL_WRITEBL2;
+ cardWRBL = receivedCmd[1];
+ break;
+ }
+
+ // works with cardINTREG
+
+ // increment, decrement, restore
+ if (len == 4 && (receivedCmd[0] == 0xC0 || receivedCmd[0] == 0xC1 || receivedCmd[0] == 0xC2)) {
+ if (receivedCmd[1] >= 16 * 4 ||
+ receivedCmd[1] / 4 != cardAUTHSC ||
+ emlCheckValBl(receivedCmd[1])) {
+ EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+ break;
}
+ EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
+ if (receivedCmd[0] == 0xC1)
+ cardSTATE = MFEMUL_INTREG_INC;
+ if (receivedCmd[0] == 0xC0)
+ cardSTATE = MFEMUL_INTREG_DEC;
+ if (receivedCmd[0] == 0xC2)
+ cardSTATE = MFEMUL_INTREG_REST;
+ cardWRBL = receivedCmd[1];
+
+ break;
}
+
- // select card
- if (len == 9 && (receivedCmd[0] == 0x93 && receivedCmd[1] == 0x70)) {
- EmSendCmd(rSAK, sizeof(rSAK));
+ // transfer
+ if (len == 4 && receivedCmd[0] == 0xB0) {
+ if (receivedCmd[1] >= 16 * 4 || receivedCmd[1] / 4 != cardAUTHSC) {
+ EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+ break;
+ }
+
+ if (emlSetValBl(cardINTREG, cardINTBLOCK, receivedCmd[1]))
+ EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+ else
+ EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
+
+ break;
+ }
- cuid = bytes_to_num(rUIDBCC1, 4);
- cardSTATE = MFEMUL_WORK;
- LED_B_ON();
-Dbprintf("--> WORK. anticol1 time: %d", GetTickCount() - timer);
+ // halt
+ if (len == 4 && (receivedCmd[0] == 0x50 && receivedCmd[1] == 0x00)) {
+ LED_B_OFF();
+ LED_C_OFF();
+ cardSTATE = MFEMUL_HALTED;
+ if (MF_DBGLEVEL >= 4) Dbprintf("--> HALTED. Selected time: %d ms", GetTickCount() - selTimer);
+ break;
}
- break;
- }
- case MFEMUL_SELECT2:{
- EmSendCmd(rUIDBCC2, sizeof(rUIDBCC2));
+ // command not allowed
+ if (len == 4) {
+ EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+ break;
+ }
- cuid = bytes_to_num(rUIDBCC2, 4);
- cardSTATE = MFEMUL_WORK;
- LED_B_ON();
-Dbprintf("--> WORK. anticol2 time: %d", GetTickCount() - timer);
+ // case break
break;
}
- case MFEMUL_AUTH1:{
-if (len) Dbprintf("au1 len:%d cmd: %02x %02x %02x %02x", len, receivedCmd[0], receivedCmd[1], receivedCmd[2], receivedCmd[3]);
- if (len == 8) {
-
+ case MFEMUL_WRITEBL2:{
+ if (len == 18){
+ mf_crypto1_decrypt(pcs, receivedCmd, len);
+ emlSetMem(receivedCmd, cardWRBL, 1);
+ EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
+ cardSTATE = MFEMUL_WORK;
+ break;
+ } else {
+ cardSTATE_TO_IDLE();
+ break;
}
break;
}
- case MFEMUL_AUTH2:{
-
- LED_C_ON();
-Dbprintf("AUTH COMPLETED. sec=%d, key=%d time=%d", cardAUTHSC, cardAUTHKEY, GetTickCount() - timer);
+
+ case MFEMUL_INTREG_INC:{
+ mf_crypto1_decrypt(pcs, receivedCmd, len);
+ memcpy(&ans, receivedCmd, 4);
+ if (emlGetValBl(&cardINTREG, &cardINTBLOCK, cardWRBL)) {
+ EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+ cardSTATE_TO_IDLE();
+ break;
+ }
+ cardINTREG = cardINTREG + ans;
+ cardSTATE = MFEMUL_WORK;
break;
}
- case MFEMUL_WORK:{
- // auth
- if (len == 4 && (receivedCmd[0] == 0x60 || receivedCmd[0] == 0x61)) {
-timer = GetTickCount();
- crypto1_create(pcs, key64);
-// if (cardAUTHKEY == 0xff) { // first auth
- crypto1_word(pcs, cuid ^ bytes_to_num(rAUTH_NT, 4), 0); // uid ^ nonce
-// } else { // nested auth
-// }
-
- EmSendCmd(rAUTH_NT, sizeof(rAUTH_NT));
- cardAUTHSC = receivedCmd[1];
- cardAUTHKEY = receivedCmd[0] - 0x60;
- cardSTATE = MFEMUL_AUTH1;
+ case MFEMUL_INTREG_DEC:{
+ mf_crypto1_decrypt(pcs, receivedCmd, len);
+ memcpy(&ans, receivedCmd, 4);
+ if (emlGetValBl(&cardINTREG, &cardINTBLOCK, cardWRBL)) {
+ EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+ cardSTATE_TO_IDLE();
+ break;
}
-
- // halt
- if (len == 4 && (receivedCmd[0] == 0x50 || receivedCmd[0] == 0x00)) {
- cardSTATE = MFEMUL_HALTED;
- LED_B_OFF();
+ cardINTREG = cardINTREG - ans;
+ cardSTATE = MFEMUL_WORK;
+ break;
+ }
+ case MFEMUL_INTREG_REST:{
+ mf_crypto1_decrypt(pcs, receivedCmd, len);
+ memcpy(&ans, receivedCmd, 4);
+ if (emlGetValBl(&cardINTREG, &cardINTBLOCK, cardWRBL)) {
+ EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA));
+ cardSTATE_TO_IDLE();
+ break;
}
+ cardSTATE = MFEMUL_WORK;
break;
}
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
- DbpString("Emulator stopped.");
+ // add trace trailer
+ memset(rAUTH_NT, 0x44, 4);
+ LogTrace(rAUTH_NT, 4, 0, 0, TRUE);
+
+ if (MF_DBGLEVEL >= 1) Dbprintf("Emulator stopped. Tracing: %d trace length: %d ", tracing, traceLen);
}
projects / proxmark3-svn / blobdiff