\r
int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * resultKey, bool calibrate) \r
{\r
- uint16_t i, len;\r
+ uint16_t i;\r
uint32_t uid;\r
UsbCommand resp;\r
+\r
StateList_t statelists[2];\r
struct Crypto1State *p1, *p2, *p3, *p4;\r
\r
memcpy(c.d.asBytes, key, 6);\r
SendCommand(&c);\r
\r
- if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
- len = resp.arg[1];\r
- if (len == 2) { \r
- memcpy(&uid, resp.d.asBytes, 4);\r
- PrintAndLog("uid:%08x len=%d trgbl=%d trgkey=%x", uid, len, (uint16_t)resp.arg[2] & 0xff, (uint16_t)resp.arg[2] >> 8);\r
- \r
- for (i = 0; i < 2; i++) {\r
- statelists[i].blockNo = resp.arg[2] & 0xff;\r
- statelists[i].keyType = (resp.arg[2] >> 8) & 0xff;\r
- statelists[i].uid = uid;\r
+ if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {\r
+ return -1;\r
+ }\r
\r
- memcpy(&statelists[i].nt, (void *)(resp.d.asBytes + 4 + i * 8 + 0), 4);\r
- memcpy(&statelists[i].ks1, (void *)(resp.d.asBytes + 4 + i * 8 + 4), 4);\r
- }\r
- }\r
- else {\r
- PrintAndLog("Got 0 keys from proxmark."); \r
- return 1;\r
- }\r
+ if (resp.arg[0]) {\r
+ return resp.arg[0]; // error during nested\r
+ }\r
+ \r
+ memcpy(&uid, resp.d.asBytes, 4);\r
+ PrintAndLog("uid:%08x trgbl=%d trgkey=%x", uid, (uint16_t)resp.arg[2] & 0xff, (uint16_t)resp.arg[2] >> 8);\r
+ \r
+ for (i = 0; i < 2; i++) {\r
+ statelists[i].blockNo = resp.arg[2] & 0xff;\r
+ statelists[i].keyType = (resp.arg[2] >> 8) & 0xff;\r
+ statelists[i].uid = uid;\r
+ memcpy(&statelists[i].nt, (void *)(resp.d.asBytes + 4 + i * 8 + 0), 4);\r
+ memcpy(&statelists[i].ks1, (void *)(resp.d.asBytes + 4 + i * 8 + 4), 4);\r
}\r
\r
// calc keys\r
crypto1_get_lfsr(statelists[0].head.slhead + i, &key64);\r
num_to_bytes(key64, 6, keyBlock);\r
key64 = 0;\r
- if (!mfCheckKeys(statelists[0].blockNo, statelists[0].keyType, 1, keyBlock, &key64)) {\r
+ if (!mfCheckKeys(statelists[0].blockNo, statelists[0].keyType, false, 1, keyBlock, &key64)) {\r
num_to_bytes(key64, 6, resultKey);\r
break;\r
}\r
}\r
\r
free(statelists[0].head.slhead);\r
- free(statelists[1].head.slhead);\r
- \r
+ free(statelists[1].head.slhead); \r
return 0;\r
}\r
\r
-int mfCheckKeys (uint8_t blockNo, uint8_t keyType, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key){\r
+int mfCheckKeys (uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key){\r
\r
*key = 0;\r
\r
- UsbCommand c = {CMD_MIFARE_CHKKEYS, {blockNo, keyType, keycnt}};\r
+ UsbCommand c = {CMD_MIFARE_CHKKEYS, {((blockNo & 0xff) | ((keyType&0xff)<<8)), clear_trace, keycnt}};\r
memcpy(c.d.asBytes, keyBlock, 6 * keycnt);\r
+ \r
+ clearCommandBuffer();\r
SendCommand(&c);\r
-\r
UsbCommand resp;\r
if (!WaitForResponseTimeout(CMD_ACK,&resp,3000)) return 1;\r
if ((resp.arg[0] & 0xff) != 0x01) return 2;\r
\r
int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {\r
UsbCommand c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}};\r
+ clearCommandBuffer();\r
SendCommand(&c);\r
-\r
UsbCommand resp;\r
if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) return 1;\r
memcpy(data, resp.d.asBytes, blocksCount * 16);\r
}\r
\r
int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {\r
- UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, 0}};\r
- memcpy(c.d.asBytes, data, blocksCount * 16); \r
+ return mfEmlSetMem_xt(data, blockNum, blocksCount, 16);\r
+}\r
+\r
+int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth) {\r
+ UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, blockBtWidth}};\r
+ memcpy(c.d.asBytes, data, blocksCount * blockBtWidth); \r
+\r
+ clearCommandBuffer();\r
SendCommand(&c);\r
return 0;\r
}\r
\r
// "MAGIC" CARD\r
\r
-int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, bool wantWipe) {\r
- uint8_t oldblock0[16] = {0x00};\r
- uint8_t block0[16] = {0x00};\r
+int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_t wipecard) {\r
\r
- int old = mfCGetBlock(0, oldblock0, CSETBLOCK_SINGLE_OPER);\r
+ uint8_t params = MAGIC_SINGLE;\r
+ uint8_t block0[16];\r
+ memset(block0, 0x00, sizeof(block0));\r
+ \r
+\r
+ int old = mfCGetBlock(0, block0, params);\r
if (old == 0) {\r
- memcpy(block0, oldblock0, 16);\r
- PrintAndLog("old block 0: %s", sprint_hex(block0,16));\r
+ PrintAndLog("old block 0: %s", sprint_hex(block0, sizeof(block0)));\r
} else {\r
PrintAndLog("Couldn't get old data. Will write over the last bytes of Block 0.");\r
}\r
// Mifare UID BCC\r
block0[4] = block0[0]^block0[1]^block0[2]^block0[3];\r
// mifare classic SAK(byte 5) and ATQA(byte 6 and 7, reversed)\r
- if (sak!=NULL)\r
+ if ( sak != NULL )\r
block0[5]=sak[0];\r
- if (atqa!=NULL) {\r
+ \r
+ if ( atqa != NULL ) {\r
block0[6]=atqa[1];\r
block0[7]=atqa[0];\r
}\r
PrintAndLog("new block 0: %s", sprint_hex(block0,16));\r
- return mfCSetBlock(0, block0, oldUID, wantWipe, CSETBLOCK_SINGLE_OPER);\r
+ \r
+ if ( wipecard ) params |= MAGIC_WIPE; \r
+ if ( oldUID == NULL) params |= MAGIC_UID;\r
+ \r
+ return mfCSetBlock(0, block0, oldUID, params);\r
}\r
\r
-int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uint8_t params) {\r
+int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params) {\r
\r
uint8_t isOK = 0;\r
- UsbCommand c = {CMD_MIFARE_CSETBLOCK, {wantWipe, params & (0xFE | (uid == NULL ? 0:1)), blockNo}};\r
+ UsbCommand c = {CMD_MIFARE_CSETBLOCK, {params, blockNo, 0}};\r
memcpy(c.d.asBytes, data, 16); \r
+ clearCommandBuffer();\r
SendCommand(&c);\r
-\r
UsbCommand resp;\r
- if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+ if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {\r
isOK = resp.arg[0] & 0xff;\r
if (uid != NULL) \r
memcpy(uid, resp.d.asBytes, 4);\r
\r
int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {\r
uint8_t isOK = 0;\r
-\r
- UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, 0, blockNo}};\r
+ UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, blockNo, 0}}; \r
+ clearCommandBuffer();\r
SendCommand(&c);\r
-\r
- UsbCommand resp;\r
+ UsbCommand resp;\r
if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
isOK = resp.arg[0] & 0xff;\r
memcpy(data, resp.d.asBytes, 16);\r
FillFileNameByUID(traceFileName, tuid, ".eml", 7);\r
\r
f = fopen(traceFileName, "r");\r
- if (!f) {\r
- fclose(f);\r
- return 1;\r
- }\r
+ if (!f) return 1;\r
\r
blockNum = 0;\r
\r
if ((!strlen(traceFileName)) || (isTraceCardEmpty())) return 0;\r
\r
f = fopen(traceFileName, "w+");\r
- if ( !f ) {\r
- fclose(f);\r
- return 1;\r
- }\r
+ if ( !f ) return 1;\r
\r
for (int i = 0; i < 64; i++) { // blocks\r
for (int j = 0; j < 16; j++) // bytes\r
\r
return 0;\r
}\r
+\r
+int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len){\r
+ /*\r
+ uint32_t nt; // tag challenge\r
+ uint32_t nr_enc; // encrypted reader challenge\r
+ uint32_t ar_enc; // encrypted reader response\r
+ uint32_t at_enc; // encrypted tag response\r
+ */\r
+\r
+ struct Crypto1State *pcs = NULL;\r
+ \r
+ ks2 = ar_enc ^ prng_successor(nt, 64);\r
+ ks3 = at_enc ^ prng_successor(nt, 96);\r
+ \r
+ PrintAndLog("Decrypting data with:");\r
+ PrintAndLog(" nt: %08x",nt);\r
+ PrintAndLog(" ar_enc: %08x",ar_enc);\r
+ PrintAndLog(" at_enc: %08x",at_enc);\r
+ PrintAndLog("\nEncrypted data: [%s]", sprint_hex(data,len) );\r
+\r
+ pcs = lfsr_recovery64(ks2, ks3);\r
+ mf_crypto1_decrypt(pcs, data, len, FALSE);\r
+ PrintAndLog("Decrypted data: [%s]", sprint_hex(data,len) );\r
+ crypto1_destroy(pcs);\r
+ return 0;\r
+}\r
projects / proxmark3-svn / blobdiff