masNt,
masNrAr,
masAt,
+ masFirstData,
masData,
masDataNested,
masError,
};
static enum MifareAuthSeq MifareAuthState;
+static TAuthData AuthData;
+
+void ClearAuthData() {
+ AuthData.uid = 0;
+ AuthData.nt = 0;
+ AuthData.first_auth = false;
+}
/**
* @brief iso14443A_CRC_check Checks CRC in command or response
{
switch(MifareAuthState) {
case masNone:
+ case masFirstData:
case masData:
case masDataNested:
case masError:
{
switch(cmd[0])
{
- case ISO14443A_CMD_WUPA: snprintf(exp,size,"WUPA"); break;
+ case ISO14443A_CMD_WUPA:
+ snprintf(exp,size,"WUPA");
+ MifareAuthState = masNone;
+ break;
case ISO14443A_CMD_ANTICOLL_OR_SELECT:{
// 93 20 = Anticollision (usage: 9320 - answer: 4bytes UID+1byte UID-bytes-xor)
// 93 70 = Select (usage: 9370+5bytes 9320 answer - answer: 1byte SAK)
snprintf(exp,size,"ANTICOLL-2"); break;
}
}
- case ISO14443A_CMD_REQA: snprintf(exp,size,"REQA"); break;
+ case ISO14443A_CMD_REQA:
+ snprintf(exp,size,"REQA");
+ MifareAuthState = masNone;
+ break;
case ISO14443A_CMD_READBLOCK: snprintf(exp,size,"READBLOCK(%d)",cmd[1]); break;
case ISO14443A_CMD_WRITEBLOCK: snprintf(exp,size,"WRITEBLOCK(%d)",cmd[1]); break;
case ISO14443A_CMD_HALT:
return;
}
-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
-
+void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, uint8_t* parity, uint8_t paritysize, bool isResponse) {
+ // get UID
+ if (MifareAuthState == masNone) {
+ if (cmdsize == 7 && cmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT && cmd[1] == 0x70) {
+ ClearAuthData();
+ AuthData.uid = bytes_to_num(&cmd[2], 4);
+ }
+ if (cmdsize == 7 && cmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2 && cmd[1] == 0x70) {
+ ClearAuthData();
+ AuthData.uid = bytes_to_num(&cmd[2], 4);
+ }
+ }
+
switch(MifareAuthState) {
case masNt:
if (cmdsize == 4 && isResponse) {
- snprintf(exp,size,"AUTH: nt %s", (nt) ? "(enc)" : "");
+ snprintf(exp,size,"AUTH: nt %s", (AuthData.first_auth) ? "" : "(enc)");
MifareAuthState = masNrAr;
- nt = bytes_to_num(cmd, cmdsize);
+ if (AuthData.first_auth)
+ AuthData.nt = bytes_to_num(cmd, cmdsize);
+ else
+ AuthData.nt_enc = bytes_to_num(cmd, cmdsize);
+ AuthData.nt_enc_par = parity[0];
return;
} else {
MifareAuthState = masError;
if (cmdsize == 8 && !isResponse) {
snprintf(exp,size,"AUTH: nr ar (enc)");
MifareAuthState = masAt;
- nr_enc = bytes_to_num(cmd, cmdsize);
- ar_enc = bytes_to_num(&cmd[3], cmdsize);
+ AuthData.nr_enc = bytes_to_num(cmd, cmdsize);
+ AuthData.ar_enc = bytes_to_num(&cmd[3], cmdsize);
+ AuthData.ar_enc_par = parity[0] << 4;
return;
} else {
MifareAuthState = masError;
case masAt:
if (cmdsize == 4 && isResponse) {
snprintf(exp,size,"AUTH: at (enc)");
- MifareAuthState = masData;
- at_enc = bytes_to_num(cmd, cmdsize);
+ MifareAuthState = masFirstData;
+ AuthData.at_enc = bytes_to_num(cmd, cmdsize);
+ AuthData.at_enc_par = parity[0];
return;
} else {
MifareAuthState = masError;