// UsbCommand ack = {CMD_ACK, {isOK, 0, 0}};\r
\r
LED_B_ON();\r
- cmd_send(CMD_ACK,isOK,0,0,0,0);\r
+ cmd_send(CMD_ACK,isOK,0,0,0,0);\r
// UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));\r
LED_B_OFF();\r
\r
(oddparity((Nt >> 8) & 0xFF) == ((parity[2]) ^ oddparity((NtEnc >> 8) & 0xFF) ^ BIT(Ks1,0)))) ? 1 : 0;\r
}\r
\r
+\r
+\r
//-----------------------------------------------------------------------------\r
// MIFARE nested authentication. \r
// \r
//-----------------------------------------------------------------------------\r
-void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)\r
+void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *datain)\r
{\r
// params\r
- uint8_t blockNo = arg0;\r
- uint8_t keyType = arg1;\r
- uint8_t targetBlockNo = arg2 & 0xff;\r
- uint8_t targetKeyType = (arg2 >> 8) & 0xff;\r
+ uint8_t blockNo = arg0 & 0xff;\r
+ uint8_t keyType = (arg0 >> 8) & 0xff;\r
+ uint8_t targetBlockNo = arg1 & 0xff;\r
+ uint8_t targetKeyType = (arg1 >> 8) & 0xff;\r
uint64_t ui64Key = 0;\r
\r
ui64Key = bytes_to_num(datain, 6);\r
\r
// variables\r
- int rtr, i, j, m, len;\r
- int davg, dmin, dmax;\r
+ uint16_t rtr, i, j, len;\r
+ uint16_t davg;\r
+ static uint16_t dmin, dmax;\r
uint8_t uid[10];\r
uint32_t cuid, nt1, nt2, nttmp, nttest, par, ks1;\r
+ uint32_t target_nt[2], target_ks[2];\r
+ \r
uint8_t par_array[4];\r
- nestedVector nvector[NES_MAX_INFO + 1][11];\r
- int nvectorcount[NES_MAX_INFO + 1];\r
- int ncount = 0;\r
+ uint16_t ncount = 0;\r
struct Crypto1State mpcs = {0, 0};\r
struct Crypto1State *pcs;\r
pcs = &mpcs;\r
uint8_t* receivedAnswer = mifare_get_bigbufptr();\r
\r
- //init\r
- for (i = 0; i < NES_MAX_INFO + 1; i++) nvectorcount[i] = 11; // 11 - empty block;\r
- \r
+ uint32_t auth1_time, auth2_time;\r
+ static uint16_t delta_time;\r
+\r
+ StartCountMifare();\r
+\r
// clear trace\r
iso14a_clear_trace();\r
- iso14a_set_tracing(false);\r
+ iso14a_set_tracing(false);\r
\r
iso14443a_setup();\r
\r
LED_A_ON();\r
- LED_B_ON();\r
LED_C_OFF();\r
\r
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
- SpinDelay(200);\r
- \r
- davg = dmax = 0;\r
- dmin = 2000;\r
\r
- // test nonce distance\r
- for (rtr = 0; rtr < 10; rtr++) {\r
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
- SpinDelay(100);\r
- FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);\r
+ while((GetCountMifare() & 0xffff0000) != 0x00010000); // wait for counter to reset and "warm up" \r
\r
- // Test if the action was cancelled\r
- if(BUTTON_PRESS()) {\r
- break;\r
- }\r
+ // statistics on nonce distance\r
+ if (calibrate) { // for first call only. Otherwise reuse previous calibration\r
+ LED_B_ON();\r
\r
- if(!iso14443a_select_card(uid, NULL, &cuid)) {\r
- if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");\r
- break;\r
- };\r
+ davg = dmax = 0;\r
+ dmin = 2000;\r
+ delta_time = 0;\r
\r
- if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1)) {\r
- if (MF_DBGLEVEL >= 1) Dbprintf("Auth1 error");\r
- break;\r
- };\r
+ for (rtr = 0; rtr < 17; rtr++) {\r
\r
- if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_NESTED, &nt2)) {\r
- if (MF_DBGLEVEL >= 1) Dbprintf("Auth2 error");\r
- break;\r
- };\r
- \r
- nttmp = prng_successor(nt1, 500);\r
- for (i = 501; i < 2000; i++) {\r
- nttmp = prng_successor(nttmp, 1);\r
- if (nttmp == nt2) break;\r
+ // prepare next select. No need to power down the card.\r
+ if(mifare_classic_halt(pcs, cuid)) {\r
+ if (MF_DBGLEVEL >= 1) Dbprintf("Nested: Halt error");\r
+ rtr--;\r
+ continue;\r
+ }\r
+\r
+ if(!iso14443a_select_card(uid, NULL, &cuid)) {\r
+ if (MF_DBGLEVEL >= 1) Dbprintf("Nested: Can't select card");\r
+ rtr--;\r
+ continue;\r
+ };\r
+\r
+ auth1_time = 0;\r
+ if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) {\r
+ if (MF_DBGLEVEL >= 1) Dbprintf("Nested: Auth1 error");\r
+ rtr--;\r
+ continue;\r
+ };\r
+\r
+ if (delta_time) {\r
+ auth2_time = auth1_time + delta_time;\r
+ } else {\r
+ auth2_time = 0;\r
+ }\r
+ if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_NESTED, &nt2, &auth2_time)) {\r
+ if (MF_DBGLEVEL >= 1) Dbprintf("Nested: Auth2 error");\r
+ rtr--;\r
+ continue;\r
+ };\r
+\r
+ nttmp = prng_successor(nt1, 500);\r
+ for (i = 501; i < 1200; i++) {\r
+ nttmp = prng_successor(nttmp, 1);\r
+ if (nttmp == nt2) break;\r
+ }\r
+\r
+ if (i != 1200) {\r
+ if (rtr != 0) {\r
+ davg += i;\r
+ dmin = MIN(dmin, i);\r
+ dmax = MAX(dmax, i);\r
+ }\r
+ else {\r
+ delta_time = auth2_time - auth1_time + 32; // allow some slack for proper timing\r
+ }\r
+ if (MF_DBGLEVEL >= 3) Dbprintf("Nested: calibrating... ntdist=%d", i);\r
+ }\r
}\r
\r
- if (i != 2000) {\r
- davg += i;\r
- if (dmin > i) dmin = i;\r
- if (dmax < i) dmax = i;\r
- if (MF_DBGLEVEL >= 4) Dbprintf("r=%d nt1=%08x nt2=%08x distance=%d", rtr, nt1, nt2, i);\r
- }\r
- }\r
- \r
- if (rtr == 0) return;\r
-\r
- davg = davg / rtr;\r
- if (MF_DBGLEVEL >= 3) Dbprintf("distance: min=%d max=%d avg=%d", dmin, dmax, davg);\r
+ if (rtr <= 1) return;\r
\r
- LED_B_OFF();\r
+ davg = (davg + (rtr - 1)/2) / (rtr - 1);\r
+ \r
+ if (MF_DBGLEVEL >= 3) Dbprintf("min=%d max=%d avg=%d, delta_time=%d", dmin, dmax, davg, delta_time);\r
\r
+ dmin = davg - 2;\r
+ dmax = davg + 2;\r
+ \r
+ LED_B_OFF();\r
+ \r
+ }\r
// ------------------------------------------------------------------------------------------------- \r
\r
LED_C_ON();\r
\r
// get crypted nonces for target sector\r
- for (rtr = 0; rtr < NS_RETRIES_GETNONCE; rtr++) {\r
- if (MF_DBGLEVEL >= 4) Dbprintf("------------------------------");\r
+ for(i=0; i < 2; i++) { // look for exactly two different nonces\r
\r
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
- SpinDelay(100);\r
- FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);\r
-\r
- // Test if the action was cancelled\r
- if(BUTTON_PRESS()) {\r
- break;\r
- }\r
-\r
- if(!iso14443a_select_card(uid, NULL, &cuid)) {\r
- if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");\r
- break;\r
- };\r
+ target_nt[i] = 0;\r
+ while(target_nt[i] == 0) { // continue until we have an unambiguous nonce\r
\r
- if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1)) {\r
- if (MF_DBGLEVEL >= 1) Dbprintf("Auth1 error");\r
- break;\r
- };\r
+ // prepare next select. No need to power down the card.\r
+ if(mifare_classic_halt(pcs, cuid)) {\r
+ if (MF_DBGLEVEL >= 1) Dbprintf("Nested: Halt error");\r
+ continue;\r
+ }\r
\r
- // nested authentication\r
- len = mifare_sendcmd_shortex(pcs, AUTH_NESTED, 0x60 + (targetKeyType & 0x01), targetBlockNo, receivedAnswer, &par);\r
- if (len != 4) {\r
- if (MF_DBGLEVEL >= 1) Dbprintf("Auth2 error len=%d", len);\r
- break;\r
- };\r
- \r
- nt2 = bytes_to_num(receivedAnswer, 4); \r
- if (MF_DBGLEVEL >= 4) Dbprintf("r=%d nt1=%08x nt2enc=%08x nt2par=%08x", rtr, nt1, nt2, par);\r
- \r
- // Parity validity check\r
- for (i = 0; i < 4; i++) {\r
- par_array[i] = (oddparity(receivedAnswer[i]) != ((par & 0x08) >> 3));\r
- par = par << 1;\r
- }\r
+ if(!iso14443a_select_card(uid, NULL, &cuid)) {\r
+ if (MF_DBGLEVEL >= 1) Dbprintf("Nested: Can't select card");\r
+ continue;\r
+ };\r
\r
- ncount = 0;\r
- nttest = prng_successor(nt1, dmin - NS_TOLERANCE);\r
- for (m = dmin - NS_TOLERANCE + 1; m < dmax + NS_TOLERANCE; m++) {\r
- nttest = prng_successor(nttest, 1);\r
- ks1 = nt2 ^ nttest;\r
-\r
- if (valid_nonce(nttest, nt2, ks1, par_array) && (ncount < 11)){\r
- \r
- nvector[NES_MAX_INFO][ncount].nt = nttest;\r
- nvector[NES_MAX_INFO][ncount].ks1 = ks1;\r
- ncount++;\r
- nvectorcount[NES_MAX_INFO] = ncount;\r
- if (MF_DBGLEVEL >= 4) Dbprintf("valid m=%d ks1=%08x nttest=%08x", m, ks1, nttest);\r
- }\r
+ auth1_time = 0;\r
+ if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) {\r
+ if (MF_DBGLEVEL >= 1) Dbprintf("Nested: Auth1 error");\r
+ continue;\r
+ };\r
\r
- }\r
+ // nested authentication\r
+ auth2_time = auth1_time + delta_time;\r
+ len = mifare_sendcmd_shortex(pcs, AUTH_NESTED, 0x60 + (targetKeyType & 0x01), targetBlockNo, receivedAnswer, &par, &auth2_time);\r
+ if (len != 4) {\r
+ if (MF_DBGLEVEL >= 1) Dbprintf("Nested: Auth2 error len=%d", len);\r
+ continue;\r
+ };\r
\r
- // select vector with length less than got\r
- if (nvectorcount[NES_MAX_INFO] != 0) {\r
- m = NES_MAX_INFO;\r
+ nt2 = bytes_to_num(receivedAnswer, 4); \r
+ if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: Testing nt1=%08x nt2enc=%08x nt2par=%02x", i+1, nt1, nt2, par);\r
\r
- for (i = 0; i < NES_MAX_INFO; i++)\r
- if (nvectorcount[i] > 10) {\r
- m = i;\r
- break;\r
- }\r
- \r
- if (m == NES_MAX_INFO)\r
- for (i = 0; i < NES_MAX_INFO; i++)\r
- if (nvectorcount[NES_MAX_INFO] < nvectorcount[i]) {\r
- m = i;\r
+ // Parity validity check\r
+ for (j = 0; j < 4; j++) {\r
+ par_array[j] = (oddparity(receivedAnswer[j]) != ((par & 0x08) >> 3));\r
+ par = par << 1;\r
+ }\r
+ \r
+ ncount = 0;\r
+ nttest = prng_successor(nt1, dmin - 1);\r
+ for (j = dmin; j < dmax + 1; j++) {\r
+ nttest = prng_successor(nttest, 1);\r
+ ks1 = nt2 ^ nttest;\r
+\r
+ if (valid_nonce(nttest, nt2, ks1, par_array)){\r
+ if (ncount > 0) { // we are only interested in disambiguous nonces, try again\r
+ if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (ambigous), ntdist=%d", i+1, j);\r
+ target_nt[i] = 0;\r
+ break;\r
+ }\r
+ target_nt[i] = nttest;\r
+ target_ks[i] = ks1;\r
+ ncount++;\r
+ if (i == 1 && target_nt[1] == target_nt[0]) { // we need two different nonces\r
+ target_nt[i] = 0;\r
+ if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#2: dismissed (= nonce#1), ntdist=%d", j);\r
break;\r
}\r
- \r
- if (m != NES_MAX_INFO) {\r
- for (i = 0; i < nvectorcount[m]; i++) {\r
- nvector[m][i] = nvector[NES_MAX_INFO][i];\r
+ if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: valid, ntdist=%d", i+1, j);\r
}\r
- nvectorcount[m] = nvectorcount[NES_MAX_INFO];\r
}\r
+ if (target_nt[i] == 0 && j == dmax+1 && MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (all invalid)", i+1);\r
}\r
}\r
\r
memset(uid, 0x44, 4);\r
LogTrace(uid, 4, 0, 0, TRUE);\r
\r
-// UsbCommand ack = {CMD_ACK, {0, 0, 0}};\r
-\r
- for (i = 0; i < NES_MAX_INFO; i++) {\r
- if (nvectorcount[i] > 10) continue;\r
- \r
- for (j = 0; j < nvectorcount[i]; j += 5) {\r
- ncount = nvectorcount[i] - j;\r
- if (ncount > 5) ncount = 5; \r
-\r
-// ack.arg[0] = 0; // isEOF = 0\r
-// ack.arg[1] = ncount;\r
-// ack.arg[2] = targetBlockNo + (targetKeyType * 0x100);\r
-// memset(ack.d.asBytes, 0x00, sizeof(ack.d.asBytes));\r
- \r
- byte_t buf[48];\r
- memset(buf, 0x00, sizeof(buf));\r
- memcpy(buf, &cuid, 4);\r
- for (m = 0; m < ncount; m++) {\r
- memcpy(buf + 8 + m * 8 + 0, &nvector[i][m + j].nt, 4);\r
- memcpy(buf + 8 + m * 8 + 4, &nvector[i][m + j].ks1, 4);\r
- }\r
- \r
- LED_B_ON();\r
- cmd_send(CMD_ACK,0,ncount,targetBlockNo + (targetKeyType * 0x100),buf,48);\r
-// UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));\r
- LED_B_OFF();\r
- }\r
- }\r
-\r
- // finalize list\r
-// ack.arg[0] = 1; // isEOF = 1\r
-// ack.arg[1] = 0;\r
-// ack.arg[2] = 0;\r
-// memset(ack.d.asBytes, 0x00, sizeof(ack.d.asBytes));\r
+ byte_t buf[4 + 4 * 4];\r
+ memcpy(buf, &cuid, 4);\r
+ memcpy(buf+4, &target_nt[0], 4);\r
+ memcpy(buf+8, &target_ks[0], 4);\r
+ memcpy(buf+12, &target_nt[1], 4);\r
+ memcpy(buf+16, &target_ks[1], 4);\r
\r
LED_B_ON();\r
-// UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));\r
- cmd_send(CMD_ACK,1,0,0,0,0);\r
+ cmd_send(CMD_ACK, 0, 2, targetBlockNo + (targetKeyType * 0x100), buf, sizeof(buf));\r
LED_B_OFF();\r
\r
- if (MF_DBGLEVEL >= 4) DbpString("NESTED FINISHED");\r
+ if (MF_DBGLEVEL >= 3) DbpString("NESTED FINISHED");\r
\r
- // Thats it...\r
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
LEDsoff();\r
- \r
- iso14a_set_tracing(TRUE);\r
+ iso14a_set_tracing(TRUE);\r
}\r
\r
//-----------------------------------------------------------------------------\r
-// MIFARE check keys. key count up to 8. \r
+// MIFARE check keys. key count up to 85. \r
// \r
//-----------------------------------------------------------------------------\r
void MifareChkKeys(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)\r
\r
// clear trace\r
iso14a_clear_trace();\r
- iso14a_set_tracing(TRUE);\r
+ iso14a_set_tracing(TRUE);\r
\r
iso14443a_setup();\r
\r
LED_B_OFF();\r
LED_C_OFF();\r
\r
- SpinDelay(300);\r
+// SpinDelay(300);\r
for (i = 0; i < keyCount; i++) {\r
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
- SpinDelay(100);\r
- FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);\r
+// FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+// SpinDelay(100);\r
+// FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);\r
+ // prepare next select by sending a HALT. There is no need to power down the card.\r
+ if(mifare_classic_halt(pcs, cuid)) {\r
+ if (MF_DBGLEVEL >= 1) Dbprintf("ChkKeys: Halt error");\r
+ }\r
\r
+ // SpinDelay(50);\r
+ \r
if(!iso14443a_select_card(uid, NULL, &cuid)) {\r
- if (OLD_MF_DBGLEVEL >= 1) Dbprintf("Can't select card");\r
+ if (OLD_MF_DBGLEVEL >= 1) Dbprintf("ChkKeys: Can't select card");\r
break;\r
};\r
\r
memset(uid, 0x44, 4);\r
LogTrace(uid, 4, 0, 0, TRUE);\r
\r
-// UsbCommand ack = {CMD_ACK, {isOK, 0, 0}};\r
-// if (isOK) memcpy(ack.d.asBytes, datain + i * 6, 6);\r
- \r
LED_B_ON();\r
cmd_send(CMD_ACK,isOK,0,0,datain + i * 6,6);\r
-// UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));\r
LED_B_OFF();\r
\r
// Thats it...\r
\r
// reset chip\r
if (needWipe){\r
- ReaderTransmitBitsPar(wupC1,7,0);\r
+ ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) {\r
if (MF_DBGLEVEL >= 1) Dbprintf("wupC1 error");\r
break;\r
};\r
\r
- ReaderTransmit(wipeC, sizeof(wipeC));\r
+ ReaderTransmit(wipeC, sizeof(wipeC), NULL);\r
if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) {\r
if (MF_DBGLEVEL >= 1) Dbprintf("wipeC error");\r
break;\r
\r
// write block\r
if (workFlags & 0x02) {\r
- ReaderTransmitBitsPar(wupC1,7,0);\r
+ ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) {\r
if (MF_DBGLEVEL >= 1) Dbprintf("wupC1 error");\r
break;\r
};\r
\r
- ReaderTransmit(wupC2, sizeof(wupC2));\r
+ ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r
if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) {\r
if (MF_DBGLEVEL >= 1) Dbprintf("wupC2 error");\r
break;\r
};\r
}\r
\r
- if ((mifare_sendcmd_short(NULL, 0, 0xA0, blockNo, receivedAnswer) != 1) || (receivedAnswer[0] != 0x0a)) {\r
+ if ((mifare_sendcmd_short(NULL, 0, 0xA0, blockNo, receivedAnswer, NULL) != 1) || (receivedAnswer[0] != 0x0a)) {\r
if (MF_DBGLEVEL >= 1) Dbprintf("write block send command error");\r
break;\r
};\r
memcpy(d_block, datain, 16);\r
AppendCrc14443a(d_block, 16);\r
\r
- ReaderTransmit(d_block, sizeof(d_block));\r
+ ReaderTransmit(d_block, sizeof(d_block), NULL);\r
if ((ReaderReceive(receivedAnswer) != 1) || (receivedAnswer[0] != 0x0a)) {\r
if (MF_DBGLEVEL >= 1) Dbprintf("write block send data error");\r
break;\r
\r
while (true) {\r
if (workFlags & 0x02) {\r
- ReaderTransmitBitsPar(wupC1,7,0);\r
+ ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) {\r
if (MF_DBGLEVEL >= 1) Dbprintf("wupC1 error");\r
break;\r
};\r
\r
- ReaderTransmit(wupC2, sizeof(wupC2));\r
+ ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r
if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) {\r
if (MF_DBGLEVEL >= 1) Dbprintf("wupC2 error");\r
break;\r
}\r
\r
// read block\r
- if ((mifare_sendcmd_short(NULL, 0, 0x30, blockNo, receivedAnswer) != 18)) {\r
+ if ((mifare_sendcmd_short(NULL, 0, 0x30, blockNo, receivedAnswer, NULL) != 18)) {\r
if (MF_DBGLEVEL >= 1) Dbprintf("read block send command error");\r
break;\r
};\r
projects / proxmark3-svn / blobdiff