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

FIX: Better legic annotation, show which byte was targeted during read and write commands.

Browse source
This commit is contained in:
iceman1001 2016-09-03 12:20:12 +02:00
parent b98827ffc3
commit e619ddc071
2 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
client/cmdhf.c
View file

@ -371,13 +371,21 @@ void annotateIso14443b(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
// 0 = write // 0 = write
// Quite simpel tag // Quite simpel tag
void annotateLegic(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){ void annotateLegic(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
switch(cmd[0]) {
case LEGIC_HSK :snprintf(exp, size, "HANDSHAKE");break; if ( cmdsize > 1) {
case LEGIC_READ :snprintf(exp, size, "READ");break; switch(cmd[0]) {
case LEGIC_WRITE :snprintf(exp, size, "WRITE");break; case LEGIC_READ :snprintf(exp, size, "READ Byte(%d)", cmd[1]);break;
default :snprintf(exp,size,"?"); break; case LEGIC_WRITE :snprintf(exp, size, "WRITE Byte(%d)", cmd[1]);break;
default :snprintf(exp, size, "?"); break;
}
} else {
switch(cmd[0]) {
case LEGIC_HSK :snprintf(exp, size, "END Handshake");break;
default :snprintf(exp, size, "?"); break;
}
} }
} }
/** /**
* @brief iso14443A_CRC_check Checks CRC in command or response * @brief iso14443A_CRC_check Checks CRC in command or response
* @param isResponse * @param isResponse
@ -491,6 +499,9 @@ uint8_t iclass_CRC_check(bool isResponse, uint8_t* data, uint8_t len)
uint8_t legic_CRC_check(bool isResponse, uint8_t* data, uint8_t len){ uint8_t legic_CRC_check(bool isResponse, uint8_t* data, uint8_t len){
if (len > 2) return 2; if (len > 2) return 2;
uint8_t calccrc = CRC8Legic(data, len);
return 0; return 0;
// crc_init(&legic_crc, 4, 0x19 >> 1, 0x5, 0); // crc_init(&legic_crc, 4, 0x19 >> 1, 0x5, 0);
// crc_clear(&legic_crc); // crc_clear(&legic_crc);
@ -654,17 +665,15 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
} }
} }
if(data_len == 0 ) if (data_len == 0 )
sprintf(line[0],"<empty trace - possible error>"); sprintf(line[0],"<empty trace - possible error>");
//--- Draw the CRC column //--- Draw the CRC column
char *crc = (crcStatus == 0 ? "!crc" : (crcStatus == 1 ? " ok " : " ")); char *crc = (crcStatus == 0 ? "!crc" : (crcStatus == 1 ? " ok " : " "));
EndOfTransmissionTimestamp = timestamp + duration; EndOfTransmissionTimestamp = timestamp + duration;
if(!isResponse) if (!isResponse) {
{
switch(protocol) { switch(protocol) {
case ICLASS: annotateIclass(explanation,sizeof(explanation),frame,data_len); break; case ICLASS: annotateIclass(explanation,sizeof(explanation),frame,data_len); break;
case ISO_14443A: annotateIso14443a(explanation,sizeof(explanation),frame,data_len); break; case ISO_14443A: annotateIso14443a(explanation,sizeof(explanation),frame,data_len); break;

2
common/protocols.h
View file

@ -326,7 +326,7 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
#define MFDES_AUTHENTICATION_FRAME 0xAF #define MFDES_AUTHENTICATION_FRAME 0xAF
// LEGIC Commands // LEGIC Commands
#define LEGIC_HSK 0xFF #define LEGIC_HSK 0x39
#define LEGIC_READ 0x01 #define LEGIC_READ 0x01
#define LEGIC_WRITE 0x00 #define LEGIC_WRITE 0x00