git.zerfleddert.de Git - proxmark3-svn/blobdiff

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c

index 27b1cf1923456be7248e1065471bc0fdc5b96ad6..15db8f1181363ec81c759f5c332b688ae5b058d2 100644 (file)

--- a/armsrc/mifarecmd.c

+++ b/armsrc/mifarecmd.c

@@ -640,8 +640,7 @@ int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, uint8_t *parity) {

// Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on\r

// Computer and Communications Security, 2015\r

//-----------------------------------------------------------------------------\r

-void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain)\r

-{\r

+void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain) {\r

uint64_t ui64Key = 0;\r

uint8_t uid[10];\r

uint32_t cuid;\r

@@ -666,7 +665,6 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,

bool field_off = flags & 0x0004;\r

\r

LED_A_ON();\r

- LED_C_OFF();\r

\r

if (initialize) {\r

iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

@@ -674,8 +672,6 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,

set_tracing(true);\r

}\r

\r

- LED_C_ON();\r

-\r

uint16_t num_nonces = 0;\r

bool have_uid = false;\r

for (uint16_t i = 0; i <= USB_CMD_DATA_SIZE - 9; ) {\r

@@ -747,21 +743,18 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,

\r

}\r

\r

- LED_C_OFF();\r

-\r

crypto1_destroy(pcs);\r

\r

if (field_off) {\r

FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

- LEDsoff();\r

+ LED_D_OFF();\r

}\r

\r

- LED_B_ON();\r

- cmd_send(CMD_ACK, isOK, cuid, num_nonces, buf, sizeof(buf));\r

- LED_B_OFF();\r

-\r

if (MF_DBGLEVEL >= 3) DbpString("AcquireEncryptedNonces finished");\r

\r

+ cmd_send(CMD_ACK, isOK, cuid, num_nonces, buf, sizeof(buf));\r

+\r

+ LED_A_OFF();\r

}\r

\r

@@ -783,9 +776,10 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat

uint16_t davg;\r

static uint16_t dmin, dmax;\r

uint8_t uid[10];\r

- uint32_t cuid, nt1, nt2, nttmp, nttest, ks1;\r

+ uint32_t cuid, nt1, nt2_enc, nttmp, nttest, ks1;\r

uint8_t par[1];\r

uint32_t target_nt[2], target_ks[2];\r

+ uint32_t fixed_nt = 0;\r

uint8_t target_nt_duplicate_count = 0;\r

\r

uint8_t par_array[4];\r

@@ -812,7 +806,6 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat

#define NESTED_MAX_TRIES 12\r

uint16_t unsuccessfull_tries = 0;\r

if (calibrate) { // for first call only. Otherwise reuse previous calibration\r

- LED_B_ON();\r

WDT_HIT();\r

\r

davg = dmax = 0;\r

@@ -846,13 +839,14 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat

rtr--;\r

continue;\r

};\r

+ fixed_nt = nt1;\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, NULL)) {\r

+ if (mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_NESTED, &nt2_enc, &auth2_time, NULL)) {\r

if (MF_DBGLEVEL >= 1) Dbprintf("Nested: Auth2 error");\r

rtr--;\r

continue;\r

@@ -861,7 +855,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat

nttmp = prng_successor(nt1, 100); //NXP Mifare is typical around 840,but for some unlicensed/compatible mifare card this can be 160\r

for (i = 101; i < 1200; i++) {\r

nttmp = prng_successor(nttmp, 1);\r

- if (nttmp == nt2) break;\r

+ if (nttmp == nt2_enc) break;\r

}\r

\r

if (i != 1200) {\r

@@ -889,21 +883,17 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat

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 (i=0; i < 2 && !isOK; i++) { // look for exactly two different nonces\r

+ for (i = 0; i < 2 && !isOK; i++) { // look for exactly two different nonces\r

\r

target_nt[i] = 0;\r

while (target_nt[i] == 0 && !isOK) { // continue until we have an unambiguous nonce\r

\r

// prepare next select. No need to power down the card.\r

- if(mifare_classic_halt(pcs, cuid)) {\r

+ if (mifare_classic_halt(pcs, cuid)) {\r

if (MF_DBGLEVEL >= 1) Dbprintf("Nested: Halt error");\r

continue;\r

}\r

@@ -934,8 +924,8 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat

continue;\r

}\r

\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[0]);\r

+ nt2_enc = bytes_to_num(receivedAnswer, 4);\r

+ if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: Testing nt1=%08x nt2enc=%08x nt2par=%02x", i+1, nt1, nt2_enc, par[0]);\r

\r

// Parity validity check\r

for (j = 0; j < 4; j++) {\r

@@ -946,9 +936,9 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat

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

+ ks1 = nt2_enc ^ nttest;\r

\r

- if (valid_nonce(nttest, nt2, ks1, par_array)){\r

+ if (valid_nonce(nttest, nt2_enc, 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

@@ -974,28 +964,25 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat

}\r

\r

- LED_C_OFF();\r

+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

+ LED_D_OFF();\r

\r

- // ----------------------------- crypto1 destroy\r

crypto1_destroy(pcs);\r

\r

- uint8_t buf[4 + 4 * 4 + 4];\r

+ uint8_t buf[4 + 4 * 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

memcpy(buf+20, &authentication_timeout, 4);\r

-\r

- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

+ memcpy(buf+24, &fixed_nt, 4);\r

\r

if (MF_DBGLEVEL >= 3) DbpString("NESTED FINISHED");\r

\r

- LED_B_ON();\r

cmd_send(CMD_ACK, isOK, 0, targetBlockNo + (targetKeyType * 0x100), buf, sizeof(buf));\r

- LED_B_OFF();\r

\r

- LEDsoff();\r

+ LED_A_OFF();\r

}\r

\r

@@ -1011,6 +998,7 @@ void MifareChkKeys(uint16_t arg0, uint32_t arg1, uint8_t arg2, uint8_t *datain)

bool multisectorCheck = arg1 & 0x02;\r

bool init = arg1 & 0x04;\r

bool drop_field = arg1 & 0x08;\r

+ bool fixed_nonce = arg1 & 0x10;\r

uint32_t auth_timeout = arg1 >> 16;\r

uint8_t keyCount = arg2;\r

\r

@@ -1039,7 +1027,14 @@ void MifareChkKeys(uint16_t arg0, uint32_t arg1, uint8_t arg2, uint8_t *datain)

} else {\r

cmd_send(CMD_ACK, 0, res, 0, NULL, 0);\r

}\r

- } else { \r

+ } else if (fixed_nonce) {\r

+ res = MifareChkBlockKeysFixedNonce(datain, keyCount, blockNo, keyType, &auth_timeout, OLD_MF_DBGLEVEL);\r

+ if (res > 0) {\r

+ cmd_send(CMD_ACK, 1, res, 0, NULL, 0); // key found\r

+ } else {\r

+ cmd_send(CMD_ACK, 0, res, 0, NULL, 0); // no key found or aborted\r

+ }\r

+ } else {\r

res = MifareChkBlockKeys(datain, keyCount, blockNo, keyType, &auth_timeout, OLD_MF_DBGLEVEL);\r

if (res > 0) {\r

cmd_send(CMD_ACK, 1, res, 0, datain + (res - 1) * 6, 6);\r