#include "crapto1.h"\r
#include "mifareutil.h"\r
\r
+int MF_DBGLEVEL = MF_DBG_ALL;\r
+\r
uint8_t* mifare_get_bigbufptr(void) {\r
return (((uint8_t *)BigBuf) + 3560); // was 3560 - tied to other size changes\r
}\r
\r
int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t* answer)\r
+{\r
+ return mifare_sendcmd_shortex(pcs, crypted, cmd, data, answer, NULL);\r
+}\r
+\r
+int mifare_sendcmd_shortex(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t* answer, uint32_t * parptr)\r
{\r
uint8_t dcmd[4], ecmd[4];\r
uint32_t pos, par, res;\r
ReaderTransmit(dcmd, sizeof(dcmd));\r
}\r
\r
- int len = ReaderReceive(answer);\r
+ int len = ReaderReceivePar(answer, &par);\r
+ \r
+ if (parptr) *parptr = par;\r
\r
- if (crypted) {\r
+ if (crypted == CRYPT_ALL) {\r
if (len == 1) {\r
res = 0;\r
for (pos = 0; pos < 4; pos++)\r
}\r
\r
int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint64_t isNested) \r
+{\r
+ return mifare_classic_authex(pcs, uid, blockNo, keyType, ui64Key, isNested, NULL);\r
+}\r
+\r
+int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint64_t isNested, uint32_t * ntptr) \r
{\r
// variables\r
- int len; \r
+ int len; \r
uint32_t pos;\r
uint8_t tmp4[4];\r
- byte_t par = 0;\r
- byte_t ar[4];\r
+ byte_t par = 0;\r
+ byte_t ar[4];\r
uint32_t nt, ntpp; // Supplied tag nonce\r
\r
uint8_t mf_nr_ar[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };\r
- uint8_t* receivedAnswer = mifare_get_bigbufptr();\r
+ uint8_t* receivedAnswer = mifare_get_bigbufptr();\r
\r
- // Transmit MIFARE_CLASSIC_AUTH\r
+ // Transmit MIFARE_CLASSIC_AUTH\r
len = mifare_sendcmd_short(pcs, isNested, 0x60 + (keyType & 0x01), blockNo, receivedAnswer);\r
-// Dbprintf("rand nonce len: %x", len); \r
- if (len != 4) return 1;\r
+ if (MF_DBGLEVEL >= 4) Dbprintf("rand nonce len: %x", len); \r
+ if (len != 4) return 1;\r
\r
ar[0] = 0x55;\r
ar[1] = 0x41;\r
\r
// Save the tag nonce (nt)\r
nt = bytes_to_num(receivedAnswer, 4);\r
- Dbprintf("uid: %x nt: %x", uid, nt); \r
\r
// ----------------------------- crypto1 create\r
- // Init cipher with key\r
+ if (isNested)\r
+ crypto1_destroy(pcs);\r
+\r
+ // Init cipher with key\r
crypto1_create(pcs, ui64Key);\r
\r
- // Load (plain) uid^nt into the cipher\r
- crypto1_word(pcs, nt ^ uid, 0);\r
+ if (isNested == AUTH_NESTED) {\r
+ // decrypt nt with help of new key \r
+ nt = crypto1_word(pcs, nt ^ uid, 1) ^ nt;\r
+ } else {\r
+ // Load (plain) uid^nt into the cipher\r
+ crypto1_word(pcs, nt ^ uid, 0);\r
+ }\r
+\r
+ // some statistic\r
+ if (!ntptr && (MF_DBGLEVEL >= 3))\r
+ Dbprintf("auth uid: %08x nt: %08x", uid, nt); \r
+ \r
+ // save Nt\r
+ if (ntptr)\r
+ *ntptr = nt;\r
\r
par = 0;\r
- // Generate (encrypted) nr+parity by loading it into the cipher (Nr)\r
- for (pos = 0; pos < 4; pos++)\r
- {\r
- mf_nr_ar[pos] = crypto1_byte(pcs, ar[pos], 0) ^ ar[pos];\r
+ // Generate (encrypted) nr+parity by loading it into the cipher (Nr)\r
+ for (pos = 0; pos < 4; pos++)\r
+ {\r
+ mf_nr_ar[pos] = crypto1_byte(pcs, ar[pos], 0) ^ ar[pos];\r
par = (par >> 1) | ( ((filter(pcs->odd) ^ oddparity(ar[pos])) & 0x01) * 0x80 );\r
- } \r
+ } \r
\r
- // Skip 32 bits in pseudo random generator\r
- nt = prng_successor(nt,32);\r
+ // Skip 32 bits in pseudo random generator\r
+ nt = prng_successor(nt,32);\r
\r
// ar+parity\r
- for (pos = 4; pos < 8; pos++)\r
- {\r
+ for (pos = 4; pos < 8; pos++)\r
+ {\r
nt = prng_successor(nt,8);\r
- mf_nr_ar[pos] = crypto1_byte(pcs,0x00,0) ^ (nt & 0xff);\r
+ mf_nr_ar[pos] = crypto1_byte(pcs,0x00,0) ^ (nt & 0xff);\r
par = (par >> 1)| ( ((filter(pcs->odd) ^ oddparity(nt & 0xff)) & 0x01) * 0x80 );\r
- } \r
+ } \r
\r
- // Transmit reader nonce and reader answer\r
- ReaderTransmitPar(mf_nr_ar, sizeof(mf_nr_ar), par);\r
+ // Transmit reader nonce and reader answer\r
+ ReaderTransmitPar(mf_nr_ar, sizeof(mf_nr_ar), par);\r
\r
- // Receive 4 bit answer\r
+ // Receive 4 bit answer\r
len = ReaderReceive(receivedAnswer);\r
- if (!len)\r
- {\r
- Dbprintf("Authentication failed. Card timeout.");\r
+ if (!len)\r
+ {\r
+ if (MF_DBGLEVEL >= 1) Dbprintf("Authentication failed. Card timeout.");\r
return 2;\r
- }\r
+ }\r
\r
- memcpy(tmp4, receivedAnswer, 4);\r
+ memcpy(tmp4, receivedAnswer, 4);\r
ntpp = prng_successor(nt, 32) ^ crypto1_word(pcs, 0,0);\r
\r
if (ntpp != bytes_to_num(tmp4, 4)) {\r
- Dbprintf("Authentication failed. Error card response.");\r
+ if (MF_DBGLEVEL >= 1) Dbprintf("Authentication failed. Error card response.");\r
return 3;\r
}\r
\r
int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData) \r
{\r
// variables\r
- int len; \r
+ int len; \r
uint8_t bt[2];\r
\r
- uint8_t* receivedAnswer = mifare_get_bigbufptr();\r
+ uint8_t* receivedAnswer = mifare_get_bigbufptr();\r
\r
- // command MIFARE_CLASSIC_READBLOCK\r
+ // command MIFARE_CLASSIC_READBLOCK\r
len = mifare_sendcmd_short(pcs, 1, 0x30, blockNo, receivedAnswer);\r
if (len == 1) {\r
- Dbprintf("Cmd Error: %02x", receivedAnswer[0]); \r
+ if (MF_DBGLEVEL >= 1) Dbprintf("Cmd Error: %02x", receivedAnswer[0]); \r
return 1;\r
}\r
if (len != 18) {\r
- Dbprintf("Cmd Error: card timeout. len: %x", len); \r
+ if (MF_DBGLEVEL >= 1) Dbprintf("Cmd Error: card timeout. len: %x", len); \r
return 2;\r
}\r
\r
memcpy(bt, receivedAnswer + 16, 2);\r
- AppendCrc14443a(receivedAnswer, 16);\r
+ AppendCrc14443a(receivedAnswer, 16);\r
if (bt[0] != receivedAnswer[16] || bt[1] != receivedAnswer[17]) {\r
- Dbprintf("Cmd CRC response error."); \r
+ if (MF_DBGLEVEL >= 1) Dbprintf("Cmd CRC response error."); \r
return 3;\r
}\r
\r
int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData) \r
{\r
// variables\r
- int len, i; \r
+ int len, i; \r
uint32_t pos;\r
- uint32_t par = 0;\r
- byte_t res;\r
+ uint32_t par = 0;\r
+ byte_t res;\r
\r
uint8_t d_block[18], d_block_enc[18];\r
- uint8_t* receivedAnswer = mifare_get_bigbufptr();\r
+ uint8_t* receivedAnswer = mifare_get_bigbufptr();\r
\r
- // command MIFARE_CLASSIC_WRITEBLOCK\r
+ // command MIFARE_CLASSIC_WRITEBLOCK\r
len = mifare_sendcmd_short(pcs, 1, 0xA0, blockNo, receivedAnswer);\r
\r
if ((len != 1) || (receivedAnswer[0] != 0x0A)) { // 0x0a - ACK\r
- Dbprintf("Cmd Error: %02x", receivedAnswer[0]); \r
+ if (MF_DBGLEVEL >= 1) Dbprintf("Cmd Error: %02x", receivedAnswer[0]); \r
return 1;\r
}\r
\r
\r
// crypto\r
par = 0;\r
- for (pos = 0; pos < 18; pos++)\r
- {\r
- d_block_enc[pos] = crypto1_byte(pcs, 0x00, 0) ^ d_block[pos];\r
+ for (pos = 0; pos < 18; pos++)\r
+ {\r
+ d_block_enc[pos] = crypto1_byte(pcs, 0x00, 0) ^ d_block[pos];\r
par = (par >> 1) | ( ((filter(pcs->odd) ^ oddparity(d_block[pos])) & 0x01) * 0x20000 );\r
- } \r
+ } \r
\r
- ReaderTransmitPar(d_block_enc, sizeof(d_block_enc), par);\r
+ ReaderTransmitPar(d_block_enc, sizeof(d_block_enc), par);\r
\r
- // Receive the response\r
+ // Receive the response\r
len = ReaderReceive(receivedAnswer); \r
\r
res = 0;\r
res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], i)) << i;\r
\r
if ((len != 1) || (res != 0x0A)) {\r
- Dbprintf("Cmd send data2 Error: %02x", res); \r
+ if (MF_DBGLEVEL >= 1) Dbprintf("Cmd send data2 Error: %02x", res); \r
return 2;\r
}\r
\r
int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid) \r
{\r
// variables\r
- int len; \r
+ int len; \r
\r
// Mifare HALT\r
- uint8_t* receivedAnswer = mifare_get_bigbufptr();\r
+ uint8_t* receivedAnswer = mifare_get_bigbufptr();\r
\r
len = mifare_sendcmd_short(pcs, 1, 0x50, 0x00, receivedAnswer);\r
- if (len != 0) {\r
- Dbprintf("halt error. response len: %x", len); \r
+ if (len != 0) {\r
+ if (MF_DBGLEVEL >= 1) Dbprintf("halt error. response len: %x", len); \r
return 1;\r
}\r
\r
projects / proxmark3-svn / blobdiff