github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-20 13:23:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

added some get auth data

Browse source
This commit is contained in:
merlokk 2018-02-09 19:32:17 +02:00
commit 6c30a244eb
1 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
client/cmdhflist.c
View file

@ -70,7 +70,6 @@ uint8_t mifare_CRC_check(bool isResponse, uint8_t* data, uint8_t len)
default: default:
return 2; return 2;
} }
} }
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)
@ -173,22 +172,33 @@ void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
} }
void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, bool isResponse) { void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, bool isResponse) {
// uint32_t uid; // UID
static uint32_t nt; // tag challenge
// uint32_t nt_enc; // encrypted tag challenge
// uint8_t nt_enc_par; // encrypted tag challenge parity
static uint32_t nr_enc; // encrypted reader challenge
static uint32_t ar_enc; // encrypted reader response
// uint8_t ar_enc_par; // encrypted reader response parity
static uint32_t at_enc; // encrypted tag response
// uint8_t at_enc_par; // encrypted tag response parity
switch(MifareAuthState) { switch(MifareAuthState) {
case masNt: case masNt:
if (cmdsize == 4) { if (cmdsize == 4) {
snprintf(exp,size,"AUTH: nt"); snprintf(exp,size,"AUTH: nt %s", (MifareAuthState == masData) ? "(enc)" : "");
MifareAuthState = masNrAr; MifareAuthState = masNrAr;
printf("--ntok\n"); nt = bytes_to_num(cmd, cmdsize);
return; return;
} else { } else {
MifareAuthState = masError; MifareAuthState = masError;
printf("--err %d\n", cmdsize);
} }
break; break;
case masNrAr: case masNrAr:
if (cmdsize == 8) { if (cmdsize == 8) {
snprintf(exp,size,"AUTH: nr ar"); snprintf(exp,size,"AUTH: nr ar (enc)");
MifareAuthState = masAt; MifareAuthState = masAt;
nr_enc = bytes_to_num(cmd, cmdsize);
ar_enc = bytes_to_num(&cmd[3], cmdsize);
return; return;
} else { } else {
MifareAuthState = masError; MifareAuthState = masError;
@ -196,8 +206,9 @@ void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, bool
break; break;
case masAt: case masAt:
if (cmdsize == 4) { if (cmdsize == 4) {
snprintf(exp,size,"AUTH: at"); snprintf(exp,size,"AUTH: at (enc)");
MifareAuthState = masData; MifareAuthState = masData;
at_enc = bytes_to_num(cmd, cmdsize);
return; return;
} else { } else {
MifareAuthState = masError; MifareAuthState = masError;