From: pwpiwi Date: Tue, 8 Oct 2019 09:54:22 +0000 (+0200) Subject: Merge branch 'master' into fix_iclass_sim X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/f31b4cd888d69e87f2eaa749fe7a626dbf7dd239 Merge branch 'master' into fix_iclass_sim --- f31b4cd888d69e87f2eaa749fe7a626dbf7dd239 diff --cc armsrc/iclass.c index 0e42fb06,ab63dcea..2533d1f9 --- a/armsrc/iclass.c +++ b/armsrc/iclass.c @@@ -1850,16 -1853,8 +1852,8 @@@ void ReaderIClass_Replay(uint8_t arg0, LED_A_OFF(); } - void iClass_ReadCheck(uint8_t blockNo, uint8_t keyType) { - uint8_t readcheck[] = { keyType, blockNo }; - uint8_t resp[] = {0,0,0,0,0,0,0,0}; - size_t isOK = 0; - isOK = sendCmdGetResponseWithRetries(readcheck, sizeof(readcheck), resp, sizeof(resp), 6); - cmd_send(CMD_ACK,isOK, 0, 0, 0, 0); - } - void iClass_Authentication(uint8_t *MAC) { - uint8_t check[] = { ICLASS_CMD_CHECK, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + uint8_t check[] = { ICLASS_CMD_CHECK_KD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; uint8_t resp[ICLASS_BUFFER_SIZE]; memcpy(check+5, MAC, 4); bool isOK;