//-----------------------------------------------------------------------------\r
-// Merlok, May 2011\r
+// Merlok, May 2011, 2012\r
// Many authors, whom made it possible\r
//\r
// This code is licensed to you under the terms of the GNU GPL, version 2 or,\r
}\r
\r
// send commands\r
-int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t* answer)\r
+int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t* answer, uint32_t *timing)\r
{\r
- return mifare_sendcmd_shortex(pcs, crypted, cmd, data, answer, NULL);\r
+ return mifare_sendcmd_shortex(pcs, crypted, cmd, data, answer, NULL, timing);\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
+int mifare_sendcmd_shortex(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t* answer, uint32_t * parptr, uint32_t *timing)\r
{\r
uint8_t dcmd[4], ecmd[4];\r
uint32_t pos, par, res;\r
par = (par >> 1) | ( ((filter(pcs->odd) ^ oddparity(dcmd[pos])) & 0x01) * 0x08 );\r
} \r
\r
- ReaderTransmitPar(ecmd, sizeof(ecmd), par);\r
+ ReaderTransmitPar(ecmd, sizeof(ecmd), par, timing);\r
\r
} else {\r
- ReaderTransmit(dcmd, sizeof(dcmd));\r
+ ReaderTransmit(dcmd, sizeof(dcmd), timing);\r
}\r
\r
int len = ReaderReceivePar(answer, &par);\r
// mifare commands\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
+ return mifare_classic_authex(pcs, uid, blockNo, keyType, ui64Key, isNested, NULL, 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
+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, uint32_t *timing) \r
{\r
// variables\r
int len; \r
uint8_t* receivedAnswer = mifare_get_bigbufptr();\r
\r
// Transmit MIFARE_CLASSIC_AUTH\r
- len = mifare_sendcmd_short(pcs, isNested, 0x60 + (keyType & 0x01), blockNo, receivedAnswer);\r
- if (MF_DBGLEVEL >= 4) Dbprintf("rand nonce len: %x", len); \r
+ len = mifare_sendcmd_short(pcs, isNested, 0x60 + (keyType & 0x01), blockNo, receivedAnswer, timing);\r
+ if (MF_DBGLEVEL >= 4) Dbprintf("rand nonce len: %x", len); \r
if (len != 4) return 1;\r
\r
ar[0] = 0x55;\r
} \r
\r
// Transmit reader nonce and reader answer\r
- ReaderTransmitPar(mf_nr_ar, sizeof(mf_nr_ar), par);\r
+ ReaderTransmitPar(mf_nr_ar, sizeof(mf_nr_ar), par, NULL);\r
\r
// Receive 4 bit answer\r
len = ReaderReceive(receivedAnswer);\r
uint8_t* receivedAnswer = mifare_get_bigbufptr();\r
\r
// command MIFARE_CLASSIC_READBLOCK\r
- len = mifare_sendcmd_short(pcs, 1, 0x30, blockNo, receivedAnswer);\r
+ len = mifare_sendcmd_short(pcs, 1, 0x30, blockNo, receivedAnswer, NULL);\r
if (len == 1) {\r
if (MF_DBGLEVEL >= 1) Dbprintf("Cmd Error: %02x", receivedAnswer[0]); \r
return 1;\r
uint8_t* receivedAnswer = mifare_get_bigbufptr();\r
\r
// command MIFARE_CLASSIC_WRITEBLOCK\r
- len = mifare_sendcmd_short(pcs, 1, 0xA0, blockNo, receivedAnswer);\r
+ len = mifare_sendcmd_short(pcs, 1, 0xA0, blockNo, receivedAnswer, NULL);\r
\r
if ((len != 1) || (receivedAnswer[0] != 0x0A)) { // 0x0a - ACK\r
if (MF_DBGLEVEL >= 1) Dbprintf("Cmd Error: %02x", receivedAnswer[0]); \r
par = (par >> 1) | ( ((filter(pcs->odd) ^ oddparity(d_block[pos])) & 0x01) * 0x20000 );\r
} \r
\r
- ReaderTransmitPar(d_block_enc, sizeof(d_block_enc), par);\r
+ ReaderTransmitPar(d_block_enc, sizeof(d_block_enc), par, NULL);\r
\r
// Receive the response\r
len = ReaderReceive(receivedAnswer); \r
// Mifare HALT\r
uint8_t* receivedAnswer = mifare_get_bigbufptr();\r
\r
- len = mifare_sendcmd_short(pcs, 1, 0x50, 0x00, receivedAnswer);\r
+ len = mifare_sendcmd_short(pcs, pcs == NULL ? 0:1, 0x50, 0x00, receivedAnswer, NULL);\r
if (len != 0) {\r
if (MF_DBGLEVEL >= 1) Dbprintf("halt error. response len: %x", len); \r
return 1;\r
memcpy(data, emCARD + bytePtr, byteCount);\r
}\r
\r
+int emlCheckValBl(int blockNum) {\r
+ uint8_t* emCARD = eml_get_bigbufptr_cardmem();\r
+ uint8_t* data = emCARD + blockNum * 16;\r
+\r
+ if ((data[0] != (data[4] ^ 0xff)) || (data[0] != data[8]) ||\r
+ (data[1] != (data[5] ^ 0xff)) || (data[1] != data[9]) ||\r
+ (data[2] != (data[6] ^ 0xff)) || (data[2] != data[10]) ||\r
+ (data[3] != (data[7] ^ 0xff)) || (data[3] != data[11]) ||\r
+ (data[12] != (data[13] ^ 0xff)) || (data[12] != data[14]) ||\r
+ (data[12] != (data[15] ^ 0xff))\r
+ ) \r
+ return 1;\r
+ return 0;\r
+}\r
+\r
+int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum) {\r
+ uint8_t* emCARD = eml_get_bigbufptr_cardmem();\r
+ uint8_t* data = emCARD + blockNum * 16;\r
+ \r
+ if (emlCheckValBl(blockNum)) {\r
+ return 1;\r
+ }\r
+ \r
+ memcpy(blReg, data, 4);\r
+ *blBlock = data[12];\r
+ \r
+ return 0;\r
+}\r
+\r
+int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum) {\r
+ uint8_t* emCARD = eml_get_bigbufptr_cardmem();\r
+ uint8_t* data = emCARD + blockNum * 16;\r
+ \r
+ memcpy(data + 0, &blReg, 4);\r
+ memcpy(data + 8, &blReg, 4);\r
+ blReg = blReg ^ 0xffffffff;\r
+ memcpy(data + 4, &blReg, 4);\r
+ \r
+ data[12] = blBlock;\r
+ data[13] = blBlock ^ 0xff;\r
+ data[14] = blBlock;\r
+ data[15] = blBlock ^ 0xff;\r
+ \r
+ return 0;\r
+}\r
+\r
uint64_t emlGetKey(int sectorNum, int keyType) {\r
uint8_t key[6];\r
uint8_t* emCARD = eml_get_bigbufptr_cardmem();\r
}\r
\r
void emlClearMem(void) {\r
- int i;\r
+ int b;\r
\r
const uint8_t trailer[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x80, 0x69, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};\r
- const uint8_t empty[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};\r
const uint8_t uid[] = {0xe6, 0x84, 0x87, 0xf3, 0x16, 0x88, 0x04, 0x00, 0x46, 0x8e, 0x45, 0x55, 0x4d, 0x70, 0x41, 0x04};\r
- // fill sectors data\r
- for(i = 0; i < 16; i++) {\r
- emlSetMem((uint8_t *)empty, i * 4 + 0, 1);\r
- emlSetMem((uint8_t *)empty, i * 4 + 1, 1);\r
- emlSetMem((uint8_t *)empty, i * 4 + 2, 1);\r
- emlSetMem((uint8_t *)trailer, i * 4 + 3, 1);\r
- }\r
+ uint8_t* emCARD = eml_get_bigbufptr_cardmem();\r
+ \r
+ memset(emCARD, 0, CARD_MEMORY_LEN);\r
+ \r
+ // fill sectors trailer data\r
+ for(b = 3; b < 256; b<127?(b+=4):(b+=16)) {\r
+ emlSetMem((uint8_t *)trailer, b , 1);\r
+ } \r
\r
// uid\r
emlSetMem((uint8_t *)uid, 0, 1);\r
projects / proxmark3-svn / blobdiff