// Coded responses need one byte per bit to transfer (data, parity, start, stop, correction)
// 28 * 8 data bits, 28 * 1 parity bits, 7 start bits, 7 stop bits, 7 correction bits
// -> need 273 bytes buffer
-// 44 * 8 data bits, 44 * 1 parity bits, 9 start bits, 9 stop bits, 9 correction bits
-#define ALLOCATED_TAG_MODULATION_BUFFER_SIZE 370 //273
+// 44 * 8 data bits, 44 * 1 parity bits, 9 start bits, 9 stop bits, 9 correction bits --370
+// 47 * 8 data bits, 47 * 1 parity bits, 10 start bits, 10 stop bits, 10 correction bits
+#define ALLOCATED_TAG_MODULATION_BUFFER_SIZE 453
bool prepare_allocated_tag_modulation(tag_response_info_t* response_info) {
// Retrieve and store the current buffer index
uint8_t ar_nr_collected = 0;
uint8_t sak;
-
- uint8_t blockzeros[512];
- memset(blockzeros, 0x00, sizeof(blockzeros));
// PACK response to PWD AUTH for EV1/NTAG
uint8_t response8[4];
//uint8_t response7_EV1[] = {0x00, 0x04, 0x03, 0x01, 0x01, 0x00, 0x0b, 0x03, 0xfd, 0xf7}; //EV1 48bytes VERSION.
uint8_t response7_NTAG[] = {0x00, 0x04, 0x04, 0x02, 0x01, 0x00, 0x11, 0x03, 0x01, 0x9e}; //NTAG 215
- #define TAG_RESPONSE_COUNT 9
+ // Prepare CHK_TEARING
+ uint8_t response9[] = {0xBD,0x90,0x3f};
+
+ #define TAG_RESPONSE_COUNT 10
tag_response_info_t responses[TAG_RESPONSE_COUNT] = {
{ .response = response1, .response_n = sizeof(response1) }, // Answer to request - respond with card type
{ .response = response2, .response_n = sizeof(response2) }, // Anticollision cascade1 - respond with uid
{ .response = response6, .response_n = sizeof(response6) }, // dummy ATS (pseudo-ATR), answer to RATS
{ .response = response7_NTAG, .response_n = sizeof(response7_NTAG) }, // EV1/NTAG GET_VERSION response
{ .response = response8, .response_n = sizeof(response8) }, // EV1/NTAG PACK response
+ { .response = response9, .response_n = sizeof(response9) } // EV1/NTAG CHK_TEAR response
};
// Allocate 512 bytes for the dynamic modulation, created when the reader queries for it
} else if(receivedCmd[0] == 0x30) { // Received a (plain) READ
uint8_t block = receivedCmd[1];
if ( tagType == 7 ) {
+ uint8_t start = 4 * block;
if ( block < 4 ) {
//NTAG 215
- uint8_t start = 4 * block;
-
uint8_t blockdata[50] = {
data[0],data[1],data[2], 0x88 ^ data[0] ^ data[1] ^ data[2],
data[3],data[4],data[5],data[6],
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,
0x00,0x00};
- ComputeCrc14443(CRC_14443_A, blockdata+start, 16, blockdata+start+17, blockdata+start+18);
- EmSendCmdEx( blockdata+start, 18, false);
- } else {
- ComputeCrc14443(CRC_14443_A, blockzeros,16, blockzeros+17,blockzeros+18);
- EmSendCmdEx(blockzeros,18,false);
+ AppendCrc14443a(blockdata+start, 16);
+ EmSendCmdEx( blockdata+start, MAX_MIFARE_FRAME_SIZE, false);
+ } else {
+ uint8_t emdata[MAX_MIFARE_FRAME_SIZE];
+ emlGetMemBt( emdata, start, 16);
+ AppendCrc14443a(emdata, 16);
+ EmSendCmdEx(emdata, sizeof(emdata), false);
}
p_response = NULL;
// We already responded, do not send anything with the EmSendCmd14443aRaw() that is called below
p_response = NULL;
}
- } else if(receivedCmd[0] == 0x3A) { // Received a FAST READ -- just returns all zeros.
- uint8_t len = (receivedCmd[2]- receivedCmd[1] ) * 4;
- ComputeCrc14443(CRC_14443_A, blockzeros,len, blockzeros+len+1, blockzeros+len+2);
- EmSendCmdEx(blockzeros,len+2,false);
- p_response = NULL;
+ } else if(receivedCmd[0] == 0x3A) { // Received a FAST READ (ranged read) -- just returns all zeros.
+
+ uint8_t emdata[MAX_FRAME_SIZE];
+ int start = receivedCmd[1] * 4;
+ int len = (receivedCmd[2] - receivedCmd[1]) * 4;
+ emlGetMemBt( emdata, start, len);
+ AppendCrc14443a(emdata, len);
+ EmSendCmdEx(emdata, len+2, false);
+ p_response = NULL;
+
} else if(receivedCmd[0] == 0x3C && tagType == 7) { // Received a READ SIGNATURE --
// ECC data, taken from a NTAG215 amiibo token. might work. LEN: 32, + 2 crc
uint8_t data[] = {0x56,0x06,0xa6,0x4f,0x43,0x32,0x53,0x6f,
0xcf,0xd3,0x61,0x36,0xca,0x5f,0xbb,0x05,
0xce,0x21,0x24,0x5b,0xa6,0x7a,0x79,0x07,
0x00,0x00};
- ComputeCrc14443(CRC_14443_A, data, sizeof(data), data+33, data+34);
+ AppendCrc14443a(data, sizeof(data)-2);
EmSendCmdEx(data,sizeof(data),false);
p_response = NULL;
} else if(receivedCmd[0] == 0x39 && tagType == 7) { // Received a READ COUNTER --
- uint8_t data[] = {0x00,0x00,0x00,0x00,0x00};
- ComputeCrc14443(CRC_14443_A, data, sizeof(data), data+4, data+5);
+ uint8_t data[] = {0x00,0x00,0x00,0x14,0xa5};
EmSendCmdEx(data,sizeof(data),false);
- p_response = NULL;
+ p_response = NULL;
+ } else if(receivedCmd[0] == 0x3E && tagType == 7) { // Received a CHECK_TEARING_EVENT --
+ p_response = &responses[9];
} else if(receivedCmd[0] == 0x50) { // Received a HALT
if (tracing) {
}
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-
- Dbprintf("%x %x %x", happened, happened2, cmdsRecvd);
- LED_A_OFF();
BigBuf_free_keep_EM();
+ LED_A_OFF();
+
+ Dbprintf("-[ Wake ups after halt [%d]", happened);
+ Dbprintf("-[ Messages after halt [%d]", happened2);
+ Dbprintf("-[ Num of received cmd [%d]", cmdsRecvd);
}
projects / proxmark3-svn / blobdiff