RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-22 23:24:22 +08:00
Code Issues Projects Releases Packages Wiki Activity

chg: 'hf iclass' removed a blocknum LUT implementation. My guess is the new crc16_iclass will do fine.

Browse source
This commit is contained in:
iceman1001 2018-01-29 16:38:03 +01:00
parent 848decd711
commit 5c380767e8
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
armsrc/iclass.c
View file

@ -43,6 +43,7 @@
// different initial value (CRC_ICLASS) // different initial value (CRC_ICLASS)
#include "iso14443crc.h" #include "iso14443crc.h"
#include "iso15693tools.h" #include "iso15693tools.h"
#include "crc16.h"
#include "protocols.h" #include "protocols.h"
#include "optimized_cipher.h" #include "optimized_cipher.h"
#include "usb_cdc.h" // for usb_poll_validate_length #include "usb_cdc.h" // for usb_poll_validate_length
@ -2055,13 +2056,8 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
uint8_t check[] = { 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; uint8_t check[] = { 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
uint8_t read[] = { 0x0c, 0x00, 0x00, 0x00 }; uint8_t read[] = { 0x0c, 0x00, 0x00, 0x00 };
uint8_t card_data[USB_CMD_DATA_SIZE] = {0}; uint8_t card_data[USB_CMD_DATA_SIZE] = {0};
uint16_t block_crc_LUT[255] = {0};
uint8_t resp[ICLASS_BUFFER_SIZE] = {0}; uint8_t resp[ICLASS_BUFFER_SIZE] = {0};
uint8_t tmp[] = {1};
//Generate a lookup table for block crc
for (uint8_t b = 0; b < 255; b++){
block_crc_LUT[b] = iclass_crc16(&b, 1);
}
static struct memory_t{ static struct memory_t{
int k16; int k16;
@ -2089,7 +2085,7 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
} }
//first get configuration block (block 1) //first get configuration block (block 1)
crc = block_crc_LUT[1]; crc = crc16_iclass( tmp , 1);
read[1] = 1; read[1] = 1;
read[2] = crc >> 8; read[2] = crc >> 8;
read[3] = crc & 0xff; read[3] = crc & 0xff;
@ -2115,10 +2111,12 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
uint32_t stored_data_length = 0; uint32_t stored_data_length = 0;
//then loop around remaining blocks //then loop around remaining blocks
for (int block=0; block < cardsize; block++) { for ( uint16_t block=0; block < cardsize; block++) {
read[1] = block; read[1] = block;
crc = block_crc_LUT[block]; //crc = block_crc_LUT[block];
tmp[0] = block & 0xFF;
crc = crc16_iclass( tmp , 1);
read[2] = crc >> 8; read[2] = crc >> 8;
read[3] = crc & 0xff; read[3] = crc & 0xff;
@ -2173,7 +2171,6 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
card_data, card_data,
0 0
); );
switch_off(); switch_off();
} }