//-----------------------------------------------------------------------------\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
-}\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
+ return mifare_sendcmd_shortex(pcs, crypted, cmd, data, answer, NULL, timing);
+}
+
+int mifare_sendcmd_short_special(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t* data, uint8_t* answer, uint8_t *timing)
+{
+ uint8_t dcmd[8];//, ecmd[4];
+ //uint32_t par=0;
+
+ dcmd[0] = cmd;
+ dcmd[1] = data[0];
+ dcmd[2] = data[1];
+ dcmd[3] = data[2];
+ dcmd[4] = data[3];
+ dcmd[5] = data[4];
+ AppendCrc14443a(dcmd, 6);
+ //Dbprintf("Data command: %02x", dcmd[0]);
+ //Dbprintf("Data R: %02x %02x %02x %02x %02x %02x %02x", dcmd[1],dcmd[2],dcmd[3],dcmd[4],dcmd[5],dcmd[6],dcmd[7]);
+
+ //memcpy(ecmd, dcmd, sizeof(dcmd));
+ ReaderTransmit(dcmd, sizeof(dcmd), NULL);
+ int len = ReaderReceive(answer);
+ if(!len)
+ {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Authentication failed. Card timeout.");
+ return 2;
+ }
+ return len;
+}
+
+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)
+{
+ uint8_t dcmd[4], ecmd[4];
uint32_t pos, par, res;\r
\r
dcmd[0] = cmd;\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
}\r
\r
memcpy(blockData, receivedAnswer, 16);\r
- return 0;\r
-}\r
-\r
-int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData) \r
-{\r
- // variables\r
+ return 0;
+}
+
+int mifare_ultra_readblock(uint32_t uid, uint8_t blockNo, uint8_t *blockData)
+{
+ // variables
+ int len;
+ uint8_t bt[2];
+
+ uint8_t* receivedAnswer = mifare_get_bigbufptr();
+
+ // command MIFARE_CLASSIC_READBLOCK
+ len = mifare_sendcmd_short(NULL, 1, 0x30, blockNo, receivedAnswer,NULL);
+ if (len == 1) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
+ return 1;
+ }
+ if (len != 18) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Cmd Error: card timeout. len: %x", len);
+ return 2;
+ }
+
+ memcpy(bt, receivedAnswer + 16, 2);
+ AppendCrc14443a(receivedAnswer, 16);
+ if (bt[0] != receivedAnswer[16] || bt[1] != receivedAnswer[17]) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Cmd CRC response error.");
+ return 3;
+ }
+
+ memcpy(blockData, receivedAnswer, 14);
+ return 0;
+}
+
+
+int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData)
+{
+ // variables
int len, i; \r
uint32_t pos;\r
uint32_t par = 0;\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
return 2;\r
}\r
\r
- return 0;\r
-}\r
-\r
-int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid) \r
-{\r
- // variables\r
+ return 0;
+}
+
+int mifare_ultra_writeblock(uint32_t uid, uint8_t blockNo, uint8_t *blockData)
+{
+ // variables
+ int len;
+ uint32_t par = 0;
+
+ uint8_t d_block[18];
+ uint8_t* receivedAnswer = mifare_get_bigbufptr();
+
+ // command MIFARE_CLASSIC_WRITEBLOCK
+ len = mifare_sendcmd_short(NULL, 1, 0xA0, blockNo, receivedAnswer,NULL);
+
+ if ((len != 1) || (receivedAnswer[0] != 0x0A)) { // 0x0a - ACK
+ if (MF_DBGLEVEL >= 1) Dbprintf("Cmd Addr Error: %02x", receivedAnswer[0]);
+ return 1;
+ }
+
+ memset(d_block,'\0',18);
+ memcpy(d_block, blockData, 16);
+ AppendCrc14443a(d_block, 16);
+
+ ReaderTransmitPar(d_block, sizeof(d_block), par, NULL);
+
+ // Receive the response
+ len = ReaderReceive(receivedAnswer);
+
+ if ((len != 1) || (receivedAnswer[0] != 0x0A)) { // 0x0a - ACK
+ if (MF_DBGLEVEL >= 1) Dbprintf("Cmd Data Error: %02x %d", receivedAnswer[0],len);
+ return 2;
+ }
+
+ return 0;
+}
+
+int mifare_ultra_special_writeblock(uint32_t uid, uint8_t blockNo, uint8_t *blockData)
+{
+ // variables
+ int len;
+ //uint32_t par = 0;
+
+ uint8_t d_block[8];
+ uint8_t* receivedAnswer = mifare_get_bigbufptr();
+
+ // command MIFARE_CLASSIC_WRITEBLOCK
+ memset(d_block,'\0',8);
+ d_block[0]= blockNo;
+ memcpy(d_block+1,blockData,4);
+ AppendCrc14443a(d_block, 6);
+
+ //i know the data send here is correct
+ len = mifare_sendcmd_short_special(NULL, 1, 0xA2, d_block, receivedAnswer,NULL);
+
+ if (receivedAnswer[0] != 0x0A) { // 0x0a - ACK
+ if (MF_DBGLEVEL >= 1) Dbprintf("Cmd Send Error: %02x %d", receivedAnswer[0],len);
+ return 1;
+ }
+ return 0;
+}
+
+int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid)
+{
+ // variables
int len; \r
\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
}\r
\r
- return 0;\r
+ return 0;
+}
+
+int mifare_ultra_halt(uint32_t uid)
+{
+ // variables
+ int len;
+
+ // Mifare HALT
+ uint8_t* receivedAnswer = mifare_get_bigbufptr();
+
+ len = mifare_sendcmd_short(NULL, 1, 0x50, 0x00, receivedAnswer, NULL);
+ if (len != 0) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("halt error. response len: %x", len);
+ return 1;
+ }
+
+ return 0;
+}
+
+\r
+// Mifare Memory Structure: up to 32 Sectors with 4 blocks each (1k and 2k cards),\r
+// plus evtl. 8 sectors with 16 blocks each (4k cards)\r
+uint8_t NumBlocksPerSector(uint8_t sectorNo) \r
+{\r
+ if (sectorNo < 32) \r
+ return 4;\r
+ else\r
+ return 16;\r
}\r
\r
-// work with emulator memory\r
-void emlSetMem(uint8_t *data, int blockNum, int blocksCount) {\r
- uint8_t* emCARD = eml_get_bigbufptr_cardmem();\r
+uint8_t FirstBlockOfSector(uint8_t sectorNo) \r
+{\r
+ if (sectorNo < 32)\r
+ return sectorNo * 4;\r
+ else\r
+ return 32*4 + (sectorNo - 32) * 16;\r
+ \r
+}\r
+\r
+\r
+// work with emulator memory
+void emlSetMem(uint8_t *data, int blockNum, int blocksCount) {
+ uint8_t* emCARD = eml_get_bigbufptr_cardmem();
\r
memcpy(emCARD + blockNum * 16, data, blocksCount * 16);\r
}\r
uint8_t key[6];\r
uint8_t* emCARD = eml_get_bigbufptr_cardmem();\r
\r
- memcpy(key, emCARD + 3 * 16 + sectorNum * 4 * 16 + keyType * 10, 6);\r
+ memcpy(key, emCARD + 16 * (FirstBlockOfSector(sectorNum) + NumBlocksPerSector(sectorNum) - 1) + keyType * 10, 6);\r
return bytes_to_num(key, 6);\r
}\r
\r
projects / proxmark3-svn / blobdiff