mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-02-13 10:43:01 +08:00
fix: 'hf iclass reader 1' - now turns off
This commit is contained in:
parent
ab0d81d01a
commit
312e4b358c
1 changed files with 7 additions and 5 deletions
|
@ -2806,25 +2806,27 @@ int readIclass(bool loop, bool verbose) {
|
||||||
uint8_t *data = resp.data.asBytes;
|
uint8_t *data = resp.data.asBytes;
|
||||||
|
|
||||||
if (verbose) PrintAndLogEx(INFO, "Readstatus:%02x", readStatus);
|
if (verbose) PrintAndLogEx(INFO, "Readstatus:%02x", readStatus);
|
||||||
|
|
||||||
// no tag found or button pressed
|
// no tag found or button pressed
|
||||||
if ((readStatus == 0 && !loop) || readStatus == 0xFF) {
|
if ((readStatus == 0 && !loop) || readStatus == 0xFF) {
|
||||||
// abort
|
// abort
|
||||||
if (verbose) {
|
DropField();
|
||||||
PrintAndLogEx(FAILED, "Quitting...");
|
return PM3_EOPABORTED;
|
||||||
DropField();
|
|
||||||
return PM3_EOPABORTED;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (readStatus & FLAG_ICLASS_READER_CSN) {
|
if (readStatus & FLAG_ICLASS_READER_CSN) {
|
||||||
PrintAndLogEx(NORMAL, " CSN: %s", sprint_hex(data, 8));
|
PrintAndLogEx(NORMAL, " CSN: %s", sprint_hex(data, 8));
|
||||||
tagFound = true;
|
tagFound = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (readStatus & FLAG_ICLASS_READER_CC) {
|
if (readStatus & FLAG_ICLASS_READER_CC) {
|
||||||
PrintAndLogEx(NORMAL, " CC: %s", sprint_hex(data + 16, 8));
|
PrintAndLogEx(NORMAL, " CC: %s", sprint_hex(data + 16, 8));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (readStatus & FLAG_ICLASS_READER_CONF) {
|
if (readStatus & FLAG_ICLASS_READER_CONF) {
|
||||||
printIclassDumpInfo(data);
|
printIclassDumpInfo(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (readStatus & FLAG_ICLASS_READER_AIA) {
|
if (readStatus & FLAG_ICLASS_READER_AIA) {
|
||||||
bool legacy = (memcmp((uint8_t *)(data + 8 * 5), "\xff\xff\xff\xff\xff\xff\xff\xff", 8) == 0);
|
bool legacy = (memcmp((uint8_t *)(data + 8 * 5), "\xff\xff\xff\xff\xff\xff\xff\xff", 8) == 0);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue