RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-19 11:33:51 +08:00
Code Issues Projects Releases Packages Wiki Activity

CHG: 'hf mf sniff' - output adjustments

Browse source
This commit is contained in:
iceman1001 2018-01-17 00:29:41 +01:00
parent b4afc8cdc4
commit 9a162c9a79
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
client/cmdhfmf.c
View file

@ -1877,7 +1877,7 @@ int CmdHF14AMfSniff(const char *Cmd){
printf("."); fflush(stdout); printf("."); fflush(stdout);
if (ukbhit()) { if (ukbhit()) {
int gc = getchar(); (void)gc; int gc = getchar(); (void)gc;
printf("\n[+] aborted via keyboard!\n"); printf("\n[!] aborted via keyboard!\n");
break; break;
} }
@ -1888,8 +1888,7 @@ int CmdHF14AMfSniff(const char *Cmd){
res = resp.arg[0] & 0xff; res = resp.arg[0] & 0xff;
traceLen = resp.arg[1]; traceLen = resp.arg[1];
len = resp.arg[2]; len = resp.arg[2];
//PrintAndLog("ice | %x | %x | %x", res, traceLen, len);
// we are done?
if (res == 0) { if (res == 0) {
PrintAndLog("[+] hf mifare sniff finished"); PrintAndLog("[+] hf mifare sniff finished");
free(buf); free(buf);
@ -1942,6 +1941,10 @@ int CmdHF14AMfSniff(const char *Cmd){
isTag = false; isTag = false;
} }
bufPtr += 2; bufPtr += 2;
// the uid identification package
// 0xFF 0xFF xx xx xx xx xx xx xx xx xx xx aa aa cc 0xFF 0xFF
// x = uid, a = atqa, c = sak
if ((len == 17) && (bufPtr[0] == 0xff) && (bufPtr[1] == 0xff) && (bufPtr[15] == 0xff) && (bufPtr[16] == 0xff)) { if ((len == 17) && (bufPtr[0] == 0xff) && (bufPtr[1] == 0xff) && (bufPtr[15] == 0xff) && (bufPtr[16] == 0xff)) {
memcpy(uid, bufPtr + 2, 10); memcpy(uid, bufPtr + 2, 10);
memcpy(atqa, bufPtr + 2 + 10, 2); memcpy(atqa, bufPtr + 2 + 10, 2);
@ -1951,7 +1954,7 @@ int CmdHF14AMfSniff(const char *Cmd){
default: uid_len = 4; break; default: uid_len = 4; break;
} }
sak = bufPtr[14]; sak = bufPtr[14];
PrintAndLog("[+] tag select uid| %s atqa:0x%02x%02x sak:0x%02x", PrintAndLog("[+] UID %s | ATQA %02x %02x | SAK 0x%02x",
sprint_hex(uid, uid_len), sprint_hex(uid, uid_len),
atqa[1], atqa[1],
atqa[0], atqa[0],
@ -1959,6 +1962,7 @@ int CmdHF14AMfSniff(const char *Cmd){
if (wantLogToFile || wantDecrypt) { if (wantLogToFile || wantDecrypt) {
FillFileNameByUID(logHexFileName, uid, ".log", uid_len); FillFileNameByUID(logHexFileName, uid, ".log", uid_len);
AddLogCurrentDT(logHexFileName); AddLogCurrentDT(logHexFileName);
PrintAndLog("[+] Trace saved to %s", logHexFileName);
} }
if (wantDecrypt) if (wantDecrypt)
mfTraceInit(uid, uid_len, atqa, sak, wantSaveToEmlFile); mfTraceInit(uid, uid_len, atqa, sak, wantSaveToEmlFile);