github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 22:03:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

hf iclass reader

Browse source
This commit is contained in:
iceman1001 2020-07-09 00:20:52 +02:00
commit a76679f7e6
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
armsrc/iclass.c
View file

@ -884,13 +884,13 @@ static bool select_iclass_tag(uint8_t *card_data, bool use_credit_key, uint32_t
void ReaderIClass(uint8_t flags) { void ReaderIClass(uint8_t flags) {
uint8_t card_data[6 * 8] = {0xFF}; uint8_t card_data[6 * 8] = {0xFF};
uint8_t last_csn[8] = {0, 0, 0, 0, 0, 0, 0, 0}; // uint8_t last_csn[8] = {0, 0, 0, 0, 0, 0, 0, 0};
uint8_t resp[ICLASS_BUFFER_SIZE]; uint8_t resp[ICLASS_BUFFER_SIZE];
// memset(card_data, 0xFF, sizeof(card_data)); // memset(card_data, 0xFF, sizeof(card_data));
memset(resp, 0xFF, sizeof(resp)); memset(resp, 0xFF, sizeof(resp));
bool flag_readonce = flags & FLAG_ICLASS_READER_ONLY_ONCE; // flag to read until one tag is found successfully // bool flag_readonce = flags & FLAG_ICLASS_READER_ONLY_ONCE; // flag to read until one tag is found successfully
bool use_credit_key = flags & FLAG_ICLASS_READER_CEDITKEY; // flag to use credit key bool use_credit_key = flags & FLAG_ICLASS_READER_CEDITKEY; // flag to use credit key
bool flag_read_aia = flags & FLAG_ICLASS_READER_AIA; // flag to read block5, application issuer area bool flag_read_aia = flags & FLAG_ICLASS_READER_AIA; // flag to read block5, application issuer area
@ -938,9 +938,11 @@ void ReaderIClass(uint8_t flags) {
// with 0xFF:s in block 3 and 4. // with 0xFF:s in block 3 and 4.
LED_B_ON(); LED_B_ON();
reply_mix(CMD_ACK, result_status, 0, 0, card_data, sizeof(card_data));
//Send back to client, but don't bother if we already sent this - //Send back to client, but don't bother if we already sent this -
// only useful if looping in arm (not try_once && not abort_after_read) // only useful if looping in arm (not try_once && not abort_after_read)
/*
if (memcmp(last_csn, card_data, 8) != 0) { if (memcmp(last_csn, card_data, 8) != 0) {
reply_mix(CMD_ACK, result_status, 0, 0, card_data, sizeof(card_data)); reply_mix(CMD_ACK, result_status, 0, 0, card_data, sizeof(card_data));
@ -950,12 +952,13 @@ void ReaderIClass(uint8_t flags) {
} }
LED_B_OFF(); LED_B_OFF();
} }
*/
// if (userCancelled) { // if (userCancelled) {
// reply_mix(CMD_ACK, 0xFF, 0, 0, card_data, 0); // reply_mix(CMD_ACK, 0xFF, 0, 0, card_data, 0);
// switch_off(); // switch_off();
// } else { // } else {
reply_mix(CMD_ACK, 0, 0, 0, card_data, 0); // reply_mix(CMD_ACK, result_status, 0, 0, card_data, 0);
// } // }
switch_off(); switch_off();
} }