X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/7906cb41ff3566aa1c27b71e457a59b4ca3e749a..refs/pull/443/head:/client/mifarehost.c?ds=sidebyside
diff --git a/client/mifarehost.c b/client/mifarehost.c
index 3b524758..a02019a3 100644
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -228,17 +228,46 @@ int mfCheckKeys (uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t key
*key = -1;
- UsbCommand c = {CMD_MIFARE_CHKKEYS, {((blockNo & 0xff) | ((keyType&0xff)<<8)), clear_trace, keycnt}};
+ UsbCommand c = {CMD_MIFARE_CHKKEYS, {((blockNo & 0xff) | ((keyType & 0xff) << 8)), clear_trace, keycnt}};
memcpy(c.d.asBytes, keyBlock, 6 * keycnt);
SendCommand(&c);
UsbCommand resp;
- if (!WaitForResponseTimeout(CMD_ACK,&resp,3000)) return 1;
+ if (!WaitForResponseTimeout(CMD_ACK,&resp,3000)) return 1;
if ((resp.arg[0] & 0xff) != 0x01) return 2;
*key = bytes_to_num(resp.d.asBytes, 6);
return 0;
}
+int mfCheckKeysSec(uint8_t sectorCnt, uint8_t keyType, uint8_t timeout14a, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, sector_t * e_sector){
+
+ uint8_t keyPtr = 0;
+
+ if (e_sector == NULL)
+ return -1;
+
+ UsbCommand c = {CMD_MIFARE_CHKKEYS, {((sectorCnt & 0xff) | ((keyType & 0xff) << 8)), (clear_trace | 0x02)|((timeout14a & 0xff) << 8), keycnt}};
+ memcpy(c.d.asBytes, keyBlock, 6 * keycnt);
+ SendCommand(&c);
+
+ UsbCommand resp;
+ if (!WaitForResponseTimeoutW(CMD_ACK, &resp, MAX(3000, 1000 + 13 * sectorCnt * keycnt * (keyType == 2 ? 2 : 1)), false)) return 1; // timeout: 13 ms / fail auth
+ if ((resp.arg[0] & 0xff) != 0x01) return 2;
+
+ bool foundAKey = false;
+ for(int sec = 0; sec < sectorCnt; sec++){
+ for(int keyAB = 0; keyAB < 2; keyAB++){
+ keyPtr = *(resp.d.asBytes + keyAB * 40 + sec);
+ if (keyPtr){
+ e_sector[sec].foundKey[keyAB] = true;
+ e_sector[sec].Key[keyAB] = bytes_to_num(keyBlock + (keyPtr - 1) * 6, 6);
+ foundAKey = true;
+ }
+ }
+ }
+ return foundAKey ? 0 : 3;
+}
+
// Compare 16 Bits out of cryptostate
int Compare16Bits(const void * a, const void * b) {
if ((*(uint64_t*)b & 0x00ff000000ff0000) == (*(uint64_t*)a & 0x00ff000000ff0000)) return 0;
@@ -418,7 +447,7 @@ int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {
UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, 0, blockNo}};
SendCommand(&c);
- UsbCommand resp;
+ UsbCommand resp;
if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
isOK = resp.arg[0] & 0xff;
memcpy(data, resp.d.asBytes, 16);
@@ -437,8 +466,8 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uin
memcpy(c.d.asBytes, data, 16);
SendCommand(&c);
- UsbCommand resp;
- if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+ UsbCommand resp;
+ if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
isOK = resp.arg[0] & 0xff;
if (uid != NULL)
memcpy(uid, resp.d.asBytes, 4);
@@ -448,25 +477,40 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uin
PrintAndLog("Command execute timeout");
return 1;
}
+
return 0;
}
-int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, bool wantWipe) {
+int mfCWipe(uint32_t numSectors, bool gen1b, bool wantWipe, bool wantFill) {
+ uint8_t isOK = 0;
+ uint8_t cmdParams = wantWipe + wantFill * 0x02 + gen1b * 0x04;
+ UsbCommand c = {CMD_MIFARE_CWIPE, {numSectors, cmdParams, 0}};
+ SendCommand(&c);
+
+ UsbCommand resp;
+ WaitForResponse(CMD_ACK,&resp);
+ isOK = resp.arg[0] & 0xff;
+
+ return isOK;
+}
+
+int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID) {
uint8_t oldblock0[16] = {0x00};
uint8_t block0[16] = {0x00};
- int old, gen = 0;
+ int gen = 0, res;
gen = mfCIdentify();
+ /* generation 1a magic card by default */
+ uint8_t cmdParams = CSETBLOCK_SINGLE_OPER;
if (gen == 2) {
/* generation 1b magic card */
- old = mfCGetBlock(0, oldblock0, CSETBLOCK_SINGLE_OPER | CSETBLOCK_MAGIC_1B);
- } else {
- /* generation 1a magic card by default */
- old = mfCGetBlock(0, oldblock0, CSETBLOCK_SINGLE_OPER);
+ cmdParams = CSETBLOCK_SINGLE_OPER | CSETBLOCK_MAGIC_1B;
}
+
+ res = mfCGetBlock(0, oldblock0, cmdParams);
- if (old == 0) {
+ if (res == 0) {
memcpy(block0, oldblock0, 16);
PrintAndLog("old block 0: %s", sprint_hex(block0,16));
} else {
@@ -477,25 +521,73 @@ int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, bool w
// UID
memcpy(block0, uid, 4);
// Mifare UID BCC
- block0[4] = block0[0]^block0[1]^block0[2]^block0[3];
+ block0[4] = block0[0] ^ block0[1] ^ block0[2] ^ block0[3];
// mifare classic SAK(byte 5) and ATQA(byte 6 and 7, reversed)
- if (sak!=NULL)
- block0[5]=sak[0];
- if (atqa!=NULL) {
- block0[6]=atqa[1];
- block0[7]=atqa[0];
+ if (sak != NULL)
+ block0[5] = sak[0];
+ if (atqa != NULL) {
+ block0[6] = atqa[1];
+ block0[7] = atqa[0];
}
- PrintAndLog("new block 0: %s", sprint_hex(block0,16));
+ PrintAndLog("new block 0: %s", sprint_hex(block0, 16));
- if (gen == 2) {
- /* generation 1b magic card */
- return mfCSetBlock(0, block0, oldUID, wantWipe, CSETBLOCK_SINGLE_OPER | CSETBLOCK_MAGIC_1B);
- } else {
- /* generation 1a magic card by default */
- return mfCSetBlock(0, block0, oldUID, wantWipe, CSETBLOCK_SINGLE_OPER);
+ res = mfCSetBlock(0, block0, oldUID, false, cmdParams);
+ if (res) {
+ PrintAndLog("Can't set block 0. Error: %d", res);
+ return res;
}
+
+ return 0;
}
+int mfCIdentify()
+{
+ UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
+ SendCommand(&c);
+
+ UsbCommand resp;
+ WaitForResponse(CMD_ACK,&resp);
+
+ // iso14a_card_select_t card;
+ // memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
+
+ // uint64_t select_status = resp.arg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
+
+ // if(select_status != 0) {
+ // uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
+ // c.arg[0] = ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT;
+ // c.arg[1] = 2;
+ // c.arg[2] = 0;
+ // memcpy(c.d.asBytes, rats, 2);
+ // SendCommand(&c);
+ // WaitForResponse(CMD_ACK,&resp);
+ // }
+
+ c.cmd = CMD_MIFARE_CIDENT;
+ c.arg[0] = 0;
+ c.arg[1] = 0;
+ c.arg[2] = 0;
+ SendCommand(&c);
+ WaitForResponse(CMD_ACK,&resp);
+
+ uint8_t isGeneration = resp.arg[0] & 0xff;
+ switch( isGeneration ){
+ case 1: PrintAndLog("Chinese magic backdoor commands (GEN 1a) detected"); break;
+ case 2: PrintAndLog("Chinese magic backdoor command (GEN 1b) detected"); break;
+ default: PrintAndLog("No chinese magic backdoor command detected"); break;
+ }
+
+ // disconnect
+ c.cmd = CMD_READER_ISO_14443a;
+ c.arg[0] = 0;
+ c.arg[1] = 0;
+ c.arg[2] = 0;
+ SendCommand(&c);
+
+ return (int) isGeneration;
+}
+
+
// SNIFFER
// constants
@@ -820,6 +912,8 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
return 0;
}
+// DECODING
+
int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len){
/*
uint32_t nt; // tag challenge
@@ -840,49 +934,3 @@ int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data,
return 0;
}
-int mfCIdentify()
-{
- UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
- SendCommand(&c);
-
- UsbCommand resp;
- WaitForResponse(CMD_ACK,&resp);
-
- iso14a_card_select_t card;
- memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
-
- uint64_t select_status = resp.arg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
-
- if(select_status != 0) {
- uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
- c.arg[0] = ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT;
- c.arg[1] = 2;
- c.arg[2] = 0;
- memcpy(c.d.asBytes, rats, 2);
- SendCommand(&c);
- WaitForResponse(CMD_ACK,&resp);
- }
-
- c.cmd = CMD_MIFARE_CIDENT;
- c.arg[0] = 0;
- c.arg[1] = 0;
- c.arg[2] = 0;
- SendCommand(&c);
- WaitForResponse(CMD_ACK,&resp);
-
- uint8_t isGeneration = resp.arg[0] & 0xff;
- switch( isGeneration ){
- case 1: PrintAndLog("Chinese magic backdoor commands (GEN 1a) detected"); break;
- case 2: PrintAndLog("Chinese magic backdoor command (GEN 1b) detected"); break;
- default: PrintAndLog("No chinese magic backdoor command detected"); break;
- }
-
- // disconnect
- c.cmd = CMD_READER_ISO_14443a;
- c.arg[0] = 0;
- c.arg[1] = 0;
- c.arg[2] = 0;
- SendCommand(&c);
-
- return (int) isGeneration;
-}