X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/61972abbdd0a03832cae7d5ae58548fed11e619e..2285d9dd944007444ceb042663fc20f6b0ac0d05:/client/mifarehost.c?ds=sidebyside
diff --git a/client/mifarehost.c b/client/mifarehost.c
index 35499b83..dc3b988a 100644
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -15,6 +15,8 @@
#include "mifarehost.h"
#include "proxmark3.h"
+#define llx PRIx64
+
// MIFARE
int compar_int(const void * a, const void * b) {
// didn't work: (the result is truncated to 32 bits)
@@ -69,7 +71,7 @@ void* nested_worker_thread(void *arg)
int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * resultKey, bool calibrate)
{
- uint16_t i, len;
+ uint16_t i;
uint32_t uid;
UsbCommand resp;
@@ -83,25 +85,23 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
memcpy(c.d.asBytes, key, 6);
SendCommand(&c);
- if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
- len = resp.arg[1];
- if (len == 2) {
- memcpy(&uid, resp.d.asBytes, 4);
- PrintAndLog("uid:%08x len=%d trgbl=%d trgkey=%x", uid, len, (uint16_t)resp.arg[2] & 0xff, (uint16_t)resp.arg[2] >> 8);
-
- for (i = 0; i < 2; i++) {
- statelists[i].blockNo = resp.arg[2] & 0xff;
- statelists[i].keyType = (resp.arg[2] >> 8) & 0xff;
- statelists[i].uid = uid;
+ if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+ return -1;
+ }
- memcpy(&statelists[i].nt, (void *)(resp.d.asBytes + 4 + i * 8 + 0), 4);
- memcpy(&statelists[i].ks1, (void *)(resp.d.asBytes + 4 + i * 8 + 4), 4);
- }
- }
- else {
- PrintAndLog("Got 0 keys from proxmark.");
- return 1;
- }
+ if (resp.arg[0]) {
+ return resp.arg[0]; // error during nested
+ }
+
+ memcpy(&uid, resp.d.asBytes, 4);
+ PrintAndLog("uid:%08x trgbl=%d trgkey=%x", uid, (uint16_t)resp.arg[2] & 0xff, (uint16_t)resp.arg[2] >> 8);
+
+ for (i = 0; i < 2; i++) {
+ statelists[i].blockNo = resp.arg[2] & 0xff;
+ statelists[i].keyType = (resp.arg[2] >> 8) & 0xff;
+ statelists[i].uid = uid;
+ memcpy(&statelists[i].nt, (void *)(resp.d.asBytes + 4 + i * 8 + 0), 4);
+ memcpy(&statelists[i].ks1, (void *)(resp.d.asBytes + 4 + i * 8 + 4), 4);
}
// calc keys
@@ -183,26 +183,26 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
crypto1_get_lfsr(statelists[0].head.slhead + i, &key64);
num_to_bytes(key64, 6, keyBlock);
key64 = 0;
- if (!mfCheckKeys(statelists[0].blockNo, statelists[0].keyType, 1, keyBlock, &key64)) {
+ if (!mfCheckKeys(statelists[0].blockNo, statelists[0].keyType, false, 1, keyBlock, &key64)) {
num_to_bytes(key64, 6, resultKey);
break;
}
}
free(statelists[0].head.slhead);
- free(statelists[1].head.slhead);
-
+ free(statelists[1].head.slhead);
return 0;
}
-int mfCheckKeys (uint8_t blockNo, uint8_t keyType, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key){
+int mfCheckKeys (uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key){
*key = 0;
- UsbCommand c = {CMD_MIFARE_CHKKEYS, {blockNo, keyType, keycnt}};
+ UsbCommand c = {CMD_MIFARE_CHKKEYS, {((blockNo & 0xff) | ((keyType&0xff)<<8)), clear_trace, keycnt}};
memcpy(c.d.asBytes, keyBlock, 6 * keycnt);
+
+ clearCommandBuffer();
SendCommand(&c);
-
UsbCommand resp;
if (!WaitForResponseTimeout(CMD_ACK,&resp,3000)) return 1;
if ((resp.arg[0] & 0xff) != 0x01) return 2;
@@ -214,17 +214,23 @@ int mfCheckKeys (uint8_t blockNo, uint8_t keyType, uint8_t keycnt, uint8_t * key
int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {
UsbCommand c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}};
+ clearCommandBuffer();
SendCommand(&c);
-
- UsbCommand resp;
+ UsbCommand resp;
if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) return 1;
memcpy(data, resp.d.asBytes, blocksCount * 16);
return 0;
}
int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
- UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, 0}};
- memcpy(c.d.asBytes, data, blocksCount * 16);
+ return mfEmlSetMem_xt(data, blockNum, blocksCount, 16);
+}
+
+int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth) {
+ UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, blockBtWidth}};
+ memcpy(c.d.asBytes, data, blocksCount * blockBtWidth);
+
+ clearCommandBuffer();
SendCommand(&c);
return 0;
}
@@ -264,9 +270,10 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uin
uint8_t isOK = 0;
UsbCommand c = {CMD_MIFARE_CSETBLOCK, {wantWipe, params & (0xFE | (uid == NULL ? 0:1)), blockNo}};
memcpy(c.d.asBytes, data, 16);
- SendCommand(&c);
- UsbCommand resp;
+ clearCommandBuffer();
+ SendCommand(&c);
+ UsbCommand resp;
if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
isOK = resp.arg[0] & 0xff;
if (uid != NULL)
@@ -284,9 +291,10 @@ int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {
uint8_t isOK = 0;
UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, 0, blockNo}};
+
+ clearCommandBuffer();
SendCommand(&c);
-
- UsbCommand resp;
+ UsbCommand resp;
if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
isOK = resp.arg[0] & 0xff;
memcpy(data, resp.d.asBytes, 16);
@@ -313,16 +321,17 @@ static uint8_t traceCurKey = 0;
struct Crypto1State *traceCrypto1 = NULL;
-struct Crypto1State *revstate;
-uint64_t lfsr;
-uint32_t ks2;
-uint32_t ks3;
+struct Crypto1State *revstate = NULL;
+
+uint64_t key = 0;
+uint32_t ks2 = 0;
+uint32_t ks3 = 0;
-uint32_t uid; // serial number
-uint32_t nt; // tag challenge
-uint32_t nr_enc; // encrypted reader challenge
-uint32_t ar_enc; // encrypted reader response
-uint32_t at_enc; // encrypted tag response
+uint32_t uid = 0; // serial number
+uint32_t nt =0; // tag challenge
+uint32_t nr_enc =0; // encrypted reader challenge
+uint32_t ar_enc =0; // encrypted reader response
+uint32_t at_enc =0; // encrypted tag response
int isTraceCardEmpty(void) {
return ((traceCard[0] == 0) && (traceCard[1] == 0) && (traceCard[2] == 0) && (traceCard[3] == 0));
@@ -354,10 +363,7 @@ int loadTraceCard(uint8_t *tuid) {
FillFileNameByUID(traceFileName, tuid, ".eml", 7);
f = fopen(traceFileName, "r");
- if (!f) {
- fclose(f);
- return 1;
- }
+ if (!f) return 1;
blockNum = 0;
@@ -368,7 +374,7 @@ int loadTraceCard(uint8_t *tuid) {
PrintAndLog("File reading error.");
fclose(f);
return 2;
- }
+ }
if (strlen(buf) < 32){
if (feof(f)) break;
@@ -394,10 +400,7 @@ int saveTraceCard(void) {
if ((!strlen(traceFileName)) || (isTraceCardEmpty())) return 0;
f = fopen(traceFileName, "w+");
- if ( !f ) {
- fclose(f);
- return 1;
- }
+ if ( !f ) return 1;
for (int i = 0; i < 64; i++) { // blocks
for (int j = 0; j < 16; j++) // bytes
@@ -474,7 +477,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
}
// AUTHENTICATION
- if ((len ==4) && ((data[0] == 0x60) || (data[0] == 0x61))) {
+ if ((len == 4) && ((data[0] == 0x60) || (data[0] == 0x61))) {
traceState = TRACE_AUTH1;
traceCurBlock = data[1];
traceCurKey = data[0] == 60 ? 1:0;
@@ -584,17 +587,17 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
lfsr_rollback_word(revstate, nr_enc, 1);
lfsr_rollback_word(revstate, uid ^ nt, 0);
- crypto1_get_lfsr(revstate, &lfsr);
- printf("key> %x%x\n", (unsigned int)((lfsr & 0xFFFFFFFF00000000) >> 32), (unsigned int)(lfsr & 0xFFFFFFFF));
- AddLogUint64(logHexFileName, "key> ", lfsr);
+ crypto1_get_lfsr(revstate, &key);
+ printf("Key: %012"llx"\n",key);
+ AddLogUint64(logHexFileName, "key: ", key);
int blockShift = ((traceCurBlock & 0xFC) + 3) * 16;
if (isBlockEmpty((traceCurBlock & 0xFC) + 3)) memcpy(traceCard + blockShift + 6, trailerAccessBytes, 4);
if (traceCurKey) {
- num_to_bytes(lfsr, 6, traceCard + blockShift + 10);
+ num_to_bytes(key, 6, traceCard + blockShift + 10);
} else {
- num_to_bytes(lfsr, 6, traceCard + blockShift);
+ num_to_bytes(key, 6, traceCard + blockShift);
}
if (wantSaveToEmlFile) saveTraceCard();
@@ -607,7 +610,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
// nt = crypto1_word(traceCrypto1, nt ^ uid, 1) ^ nt;
- /* traceCrypto1 = crypto1_create(lfsr); // key in lfsr
+ /* traceCrypto1 = crypto1_create(key); // key in lfsr
crypto1_word(traceCrypto1, nt ^ uid, 0);
crypto1_word(traceCrypto1, ar, 1);
crypto1_word(traceCrypto1, 0, 0);
@@ -627,3 +630,29 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
return 0;
}
+
+int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len){
+ /*
+ uint32_t nt; // tag challenge
+ uint32_t nr_enc; // encrypted reader challenge
+ uint32_t ar_enc; // encrypted reader response
+ uint32_t at_enc; // encrypted tag response
+ */
+
+ struct Crypto1State *pcs = NULL;
+
+ ks2 = ar_enc ^ prng_successor(nt, 64);
+ ks3 = at_enc ^ prng_successor(nt, 96);
+
+ PrintAndLog("Decrypting data with:");
+ PrintAndLog(" nt: %08x",nt);
+ PrintAndLog(" ar_enc: %08x",ar_enc);
+ PrintAndLog(" at_enc: %08x",at_enc);
+ PrintAndLog("\nEncrypted data: [%s]", sprint_hex(data,len) );
+
+ pcs = lfsr_recovery64(ks2, ks3);
+ mf_crypto1_decrypt(pcs, data, len, FALSE);
+ PrintAndLog("Decrypted data: [%s]", sprint_hex(data,len) );
+ crypto1_destroy(pcs);
+ return 0;
+}