RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-12-31 04:39:49 +08:00
Code Issues Projects Releases Packages Wiki Activity

FIX: increased the limit to 0xE6 for MIFARE_ULEV1_FASTREAD

Browse source 
ADD: @marshmellows inital "hf search" command...
This commit is contained in:
iceman1001 2015-05-12 18:57:47 +02:00
parent 98cdd56862
commit b6901e17c8
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
client/cmdhf.c
View file

@ -36,6 +36,8 @@ int CmdHFTune(const char *Cmd)
return 0; return 0;
} }
//TODO:
//void annotateIso15693(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){}
void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
{ {
@ -89,7 +91,7 @@ void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
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 ( cmdsize >=3 && cmd[2] < 0x21) if ( cmdsize >=3 && cmd[2] <= 0xE6)
snprintf(exp,size,"READ RANGE (%d-%d)",cmd[1],cmd[2]); snprintf(exp,size,"READ RANGE (%d-%d)",cmd[1],cmd[2]);
else else
snprintf(exp,size,"?"); snprintf(exp,size,"?");
@ -656,6 +658,21 @@ int CmdHFList(const char *Cmd)
return 0; return 0;
} }
int CmdHFSearch(const char *Cmd){
int ans = 0;
ans = CmdHF14AReader(Cmd);
if (ans > 0) return ans;
ans = CmdHF15Reader(Cmd);
//if (ans > 0) return ans;
ans = CmdHF14BRead(Cmd);
//if (ans > 0) return ans;
ans = CmdHFiClassReader(Cmd);
//if (ans > 0) return ans;
return 0;
}
static command_t CommandTable[] = static command_t CommandTable[] =
{ {
@ -672,6 +689,7 @@ static command_t CommandTable[] =
{"topaz", CmdHFTopaz, 1, "{ TOPAZ (NFC Type 1) RFIDs... }"}, {"topaz", CmdHFTopaz, 1, "{ TOPAZ (NFC Type 1) RFIDs... }"},
{"tune", CmdHFTune, 0, "Continuously measure HF antenna tuning"}, {"tune", CmdHFTune, 0, "Continuously measure HF antenna tuning"},
{"list", CmdHFList, 1, "List protocol data in trace buffer"}, {"list", CmdHFList, 1, "List protocol data in trace buffer"},
{"search", CmdHFSearch, 1, "Search for known HF tags"},
{NULL, NULL, 0, NULL} {NULL, NULL, 0, NULL}
}; };

1
client/cmdhf.h
View file

@ -14,4 +14,5 @@
int CmdHF(const char *Cmd); int CmdHF(const char *Cmd);
int CmdHFTune(const char *Cmd); int CmdHFTune(const char *Cmd);
int CmdHFList(const char *Cmd); int CmdHFList(const char *Cmd);
int CmdHFSearch(const char *Cmd);
#endif #endif