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

CHG: @marshmellows changes to anntations.

Browse source
This commit is contained in:
iceman1001 2015-05-06 14:20:24 +02:00
commit 74c7ff4770
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
client/cmdhf.c
View file

@ -88,31 +88,37 @@ void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
case MIFARE_ULC_AUTH_1 : snprintf(exp,size,"AUTH "); break; case MIFARE_ULC_AUTH_1 : snprintf(exp,size,"AUTH "); break;
case MIFARE_ULC_AUTH_2 : snprintf(exp,size,"AUTH_ANSW"); break; case MIFARE_ULC_AUTH_2 : snprintf(exp,size,"AUTH_ANSW"); break;
case MIFARE_ULEV1_AUTH : snprintf(exp,size,"PWD-AUTH"); break; case MIFARE_ULEV1_AUTH : snprintf(exp,size,"PWD-AUTH"); break;
case MIFARE_ULEV1_FASTREAD : { case MIFARE_ULEV1_FASTREAD : {
if ( cmd[2] < 0x21) if ( cmdsize >=3 && cmd[2] < 0x21)
snprintf(exp,size,"READ RANGE (%d-%d)",cmd[1],cmd[2]); snprintf(exp,size,"READ RANGE (%d-%d)",cmd[1],cmd[2]);
else
snprintf(exp,size,"?");
break; break;
} }
case MIFARE_ULEV1_WRITE : { case MIFARE_ULEV1_WRITE : {
if ( cmd[1] < 0x21 ) if ( cmd[1] < 0x21 )
snprintf(exp,size,"WRITEBLOCK(%d)",cmd[1]); snprintf(exp,size,"WRITEBLOCK(%d)",cmd[1]);
else
snprintf(exp,size,"?");
break; break;
} }
case MIFARE_ULEV1_READ_CNT :{ case MIFARE_ULEV1_READ_CNT :{
if ( cmd[1] < 5 ) if ( cmd[1] < 5 )
snprintf(exp,size,"READ CNT(%d)",cmd[1]); snprintf(exp,size,"READ CNT(%d)",cmd[1]);
else
snprintf(exp,size,"?");
break; break;
} }
case MIFARE_ULEV1_INCR_CNT : { case MIFARE_ULEV1_INCR_CNT : {
if ( cmd[1] < 5 ) if ( cmd[1] < 5 )
snprintf(exp,size,"INC(%d)",cmd[1]); snprintf(exp,size,"INCR(%d)",cmd[1]);
else
snprintf(exp,size,"?");
break; break;
} }
case MIFARE_ULEV1_READSIG : snprintf(exp,size,"READ_SIG"); break; case MIFARE_ULEV1_READSIG : snprintf(exp,size,"READ_SIG"); break;
case MIFARE_ULEV1_CHECKTEAR : snprintf(exp,size,"CHK_TEARING(%d)",cmd[1]); break; case MIFARE_ULEV1_CHECKTEAR : snprintf(exp,size,"CHK_TEARING(%d)",cmd[1]); break;
case MIFARE_ULEV1_VCSL : snprintf(exp,size,"VCSL"); break; case MIFARE_ULEV1_VCSL : snprintf(exp,size,"VCSL"); break;
default: snprintf(exp,size,"?"); break; default: snprintf(exp,size,"?"); break;
} }
return; return;
@ -274,9 +280,8 @@ uint8_t iso14443B_CRC_check(bool isResponse, uint8_t* data, uint8_t len)
ComputeCrc14443(CRC_14443_B, data, len-2, &b1, &b2); ComputeCrc14443(CRC_14443_B, data, len-2, &b1, &b2);
if(b1 != data[len-2] || b2 != data[len-1]) { if(b1 != data[len-2] || b2 != data[len-1]) {
return 0; return 0;
} else {
return 1;
} }
return 1;
} }
/** /**