]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - armsrc/iso14443a.c
FIX: fastread dont do multiplication by zero, thanks @marshmellow42
[proxmark3-svn] / armsrc / iso14443a.c
index 372fa3d1d5fbbc170b244349bc69f2aef666fd39..9f2b6d9477d14764cf88a0c07f01f68d16b39974 100644 (file)
@@ -913,8 +913,9 @@ bool prepare_tag_modulation(tag_response_info_t* response_info, size_t max_buffe
 // 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
@@ -947,9 +948,6 @@ void SimulateIso14443aTag(int tagType, int flags, int uid_2nd, byte_t* data)
        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];
@@ -1064,7 +1062,10 @@ void SimulateIso14443aTag(int tagType, int flags, int uid_2nd, byte_t* data)
        //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
@@ -1075,6 +1076,7 @@ void SimulateIso14443aTag(int tagType, int flags, int uid_2nd, byte_t* data)
                { .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
@@ -1152,11 +1154,10 @@ void SimulateIso14443aTag(int tagType, int flags, int uid_2nd, byte_t* data)
                } 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],
@@ -1167,11 +1168,13 @@ void SimulateIso14443aTag(int tagType, int flags, int uid_2nd, byte_t* data)
                                        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;
                                
@@ -1181,11 +1184,42 @@ void SimulateIso14443aTag(int tagType, int flags, int uid_2nd, byte_t* data)
                                // 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] + 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,
+                                                                 0x43,0xda,0x45,0xd6,0x61,0x38,0xaa,0x1e,
+                                                                 0xcf,0xd3,0x61,0x36,0xca,0x5f,0xbb,0x05,
+                                                                 0xce,0x21,0x24,0x5b,0xa6,0x7a,0x79,0x07,
+                                                                 0x00,0x00};
+                               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,0x14,0xa5};
+                               EmSendCmdEx(data,sizeof(data),false);                           
+                               p_response = NULL;
+               } else if(receivedCmd[0] == 0xA5 && tagType == 7) {     // Received a INC COUNTER -- 
+                       // number of counter
+                       //uint8_t counter = receivedCmd[1];
+                       //uint32_t val = bytes_to_num(receivedCmd+2,4);
+                       
+                       // send ACK
+                       uint8_t ack[] = {0x0a};
+                       EmSendCmdEx(ack,sizeof(ack),false);
+                       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) {
@@ -1257,6 +1291,8 @@ void SimulateIso14443aTag(int tagType, int flags, int uid_2nd, byte_t* data)
                {
                        if ( tagType == 7 ) {
                                p_response =  &responses[8]; // PACK response
+                               uint32_t pwd = bytes_to_num(receivedCmd+1,4);
+                               Dbprintf("Auth attempt: %08x", pwd);    
                        }
                }
                else {
@@ -1363,10 +1399,12 @@ void SimulateIso14443aTag(int tagType, int flags, int uid_2nd, byte_t* data)
        }
 
        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);
 }
 
 
Impressum, Datenschutz