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

chg: 'hf list mf' - 10b uid

Browse source
This commit is contained in:
iceman1001 2018-02-14 23:48:45 +01:00
commit b8ddb3b384
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/cmdhf.c
View file

@ -226,9 +226,9 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
// Always annotate LEGIC read/tag // Always annotate LEGIC read/tag
if ( protocol == LEGIC ) if ( protocol == LEGIC )
annotateLegic(explanation,sizeof(explanation),frame,data_len); annotateLegic(explanation, sizeof(explanation), frame, data_len);
if (protocol == PROTO_MIFARE) if ( protocol == PROTO_MIFARE )
annotateMifare(explanation, sizeof(explanation), frame, data_len, parityBytes, parity_len, isResponse); annotateMifare(explanation, sizeof(explanation), frame, data_len, parityBytes, parity_len, isResponse);
if (!isResponse) { if (!isResponse) {

4
client/cmdhflist.c
View file

@ -544,6 +544,10 @@ void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, uint8
ClearAuthData(); ClearAuthData();
AuthData.uid = bytes_to_num(&cmd[2], 4); AuthData.uid = bytes_to_num(&cmd[2], 4);
} }
if (cmdsize == 9 && cmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_3 && cmd[1] == 0x70) {
ClearAuthData();
AuthData.uid = bytes_to_num(&cmd[2], 4);
}
} }
switch(MifareAuthState) { switch(MifareAuthState) {