X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/c8a0f5503172f25620670a9ba992d8c923b5df95..refs/heads/master:/client/cmdhfmfp.c
diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index c5fd8eed..5255e5a8 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -1,5 +1,6 @@
//-----------------------------------------------------------------------------
// Copyright (C) 2018 Merlok
+// Copyright (C) 2018 drHatson
//
// This code is licensed to you under the terms of the GNU GPL, version 2 or,
// at your option, any later version. See the LICENSE.txt file for the text of
@@ -21,101 +22,17 @@
#include "ui.h"
#include "cmdhf14a.h"
#include "mifare.h"
-#include "mifare4.h"
+#include "mifare/mifare4.h"
+#include "mifare/mad.h"
+#include "mifare/ndef.h"
#include "cliparser/cliparser.h"
-#include "polarssl/libpcrypto.h"
+#include "crypto/libpcrypto.h"
+#include "emv/dump.h"
static const uint8_t DefaultKey[16] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-typedef struct {
- uint8_t Code;
- const char *Description;
-} PlusErrorsElm;
-
-static const PlusErrorsElm PlusErrors[] = {
- {0xFF, ""},
- {0x00, "Unknown error"},
- {0x06, "Block use error"},
- {0x07, "Command use error"},
- {0x08, "Invalid write command"},
- {0x09, "Invalid block number"},
- {0x0b, "Command code error"},
- {0x0c, "Length error"},
- {0x90, "OK"},
-};
-int PlusErrorsLen = sizeof(PlusErrors) / sizeof(PlusErrorsElm);
-
-const char * GetErrorDescription(uint8_t errorCode) {
- for(int i = 0; i < PlusErrorsLen; i++)
- if (errorCode == PlusErrors[i].Code)
- return PlusErrors[i].Description;
-
- return PlusErrors[0].Description;
-}
-
static int CmdHelp(const char *Cmd);
-static bool VerboseMode = false;
-void SetVerboseMode(bool verbose) {
- VerboseMode = verbose;
-}
-
-int intExchangeRAW14aPlus(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
- if(VerboseMode)
- PrintAndLog(">>> %s", sprint_hex(datain, datainlen));
-
- int res = ExchangeRAW14a(datain, datainlen, activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
-
- if(VerboseMode)
- PrintAndLog("<<< %s", sprint_hex(dataout, *dataoutlen));
-
- return res;
-}
-
-int MFPWritePerso(uint8_t *keyNum, uint8_t *key, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
- uint8_t rcmd[3 + 16] = {0xa8, keyNum[1], keyNum[0], 0x00};
- memmove(&rcmd[3], key, 16);
-
- return intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
-}
-
-int MFPCommitPerso(bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
- uint8_t rcmd[1] = {0xaa};
-
- return intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
-}
-
-int MFPReadBlock(mf4Session *session, bool plain, uint8_t blockNum, uint8_t blockCount, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, uint8_t *mac) {
- uint8_t rcmd[4 + 8] = {(plain?(0x37):(0x33)), blockNum, 0x00, blockCount};
- if (!plain && session)
- CalculateMAC(session, rcmd, 4, &rcmd[4], VerboseMode);
-
- int res = intExchangeRAW14aPlus(rcmd, plain?4:sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
- if(res)
- return res;
-
- if(session && mac)
- CalculateMAC(session, dataout, *dataoutlen, mac, VerboseMode);
-
- return 0;
-}
-
-int MFPWriteBlock(mf4Session *session, uint8_t blockNum, uint8_t *data, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, uint8_t *mac) {
- uint8_t rcmd[1 + 2 + 16 + 8] = {0xA3, blockNum, 0x00};
- memmove(&rcmd[3], data, 16);
- if (session)
- CalculateMAC(session, rcmd, 19, &rcmd[19], VerboseMode);
-
- int res = intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
- if(res)
- return res;
-
- if(session && mac)
- CalculateMAC(session, dataout, *dataoutlen, mac, VerboseMode);
-
- return 0;
-}
-
int CmdHFMFPInfo(const char *cmd) {
if (cmd && strlen(cmd) > 0)
@@ -220,7 +137,7 @@ int CmdHFMFPWritePerso(const char *cmd) {
CLIGetHexWithReturn(3, key, &keyLen);
CLIParserFree();
- SetVerboseMode(verbose);
+ mfpSetVerboseMode(verbose);
if (!keyLen) {
memmove(key, DefaultKey, 16);
@@ -251,7 +168,7 @@ int CmdHFMFPWritePerso(const char *cmd) {
}
if (data[0] != 0x90) {
- PrintAndLog("Command error: %02x %s", data[0], GetErrorDescription(data[0]));
+ PrintAndLog("Command error: %02x %s", data[0], mfpGetErrorDescription(data[0]));
return 1;
}
PrintAndLog("Write OK.");
@@ -295,7 +212,7 @@ int CmdHFMFPInitPerso(const char *cmd) {
if (!keyLen)
memmove(key, DefaultKey, 16);
- SetVerboseMode(verbose2);
+ mfpSetVerboseMode(verbose2);
for (uint16_t sn = 0x4000; sn < 0x4050; sn++) {
keyNum[0] = sn >> 8;
keyNum[1] = sn & 0xff;
@@ -310,7 +227,7 @@ int CmdHFMFPInitPerso(const char *cmd) {
}
}
- SetVerboseMode(verbose);
+ mfpSetVerboseMode(verbose);
for (int i = 0; i < sizeof(CardAddresses) / 2; i++) {
keyNum[0] = CardAddresses[i] >> 8;
keyNum[1] = CardAddresses[i] & 0xff;
@@ -351,7 +268,7 @@ int CmdHFMFPCommitPerso(const char *cmd) {
bool verbose = arg_get_lit(1);
CLIParserFree();
- SetVerboseMode(verbose);
+ mfpSetVerboseMode(verbose);
uint8_t data[250] = {0};
int datalen = 0;
@@ -368,7 +285,7 @@ int CmdHFMFPCommitPerso(const char *cmd) {
}
if (data[0] != 0x90) {
- PrintAndLog("Command error: %02x %s", data[0], GetErrorDescription(data[0]));
+ PrintAndLog("Command error: %02x %s", data[0], mfpGetErrorDescription(data[0]));
return 1;
}
PrintAndLog("Switch level OK.");
@@ -420,7 +337,7 @@ int CmdHFMFPRdbl(const char *cmd) {
int keylen = 0;
CLIParserInit("hf mfp rdbl",
- "Reads several blocks from Mifare Plus card in plain mode.",
+ "Reads several blocks from Mifare Plus card.",
"Usage:\n\thf mfp rdbl 0 000102030405060708090a0b0c0d0e0f -> executes authentication and read block 0 data\n"
"\thf mfp rdbl 1 -v -> executes authentication and shows sector 1 data with default key 0xFF..0xFF and some additional data\n");
@@ -429,7 +346,7 @@ int CmdHFMFPRdbl(const char *cmd) {
arg_lit0("vV", "verbose", "show internal data."),
arg_int0("nN", "count", "blocks count (by default 1).", NULL),
arg_lit0("bB", "keyb", "use key B (by default keyA)."),
- arg_lit0("pP", "plain", "plain communication between reader and card."),
+ arg_lit0("pP", "plain", "plain communication mode between reader and card."),
arg_int1(NULL, NULL, "<Block Num (0..255)>", NULL),
arg_str0(NULL, NULL, "<Key Value (HEX 16 bytes)>", NULL),
arg_param_end
@@ -439,12 +356,12 @@ int CmdHFMFPRdbl(const char *cmd) {
bool verbose = arg_get_lit(1);
int blocksCount = arg_get_int_def(2, 1);
bool keyB = arg_get_lit(3);
- int plain = arg_get_lit(4) | true;
+ int plain = arg_get_lit(4);
uint32_t blockn = arg_get_int(5);
CLIGetHexWithReturn(6, key, &keylen);
CLIParserFree();
- SetVerboseMode(verbose);
+ mfpSetVerboseMode(verbose);
if (!keylen) {
memmove(key, DefaultKey, 16);
@@ -467,6 +384,10 @@ int CmdHFMFPRdbl(const char *cmd) {
return 1;
}
+ if (blocksCount > 1 && mfIsSectorTrailer(blockn)) {
+ PrintAndLog("WARNING: trailer!");
+ }
+
uint8_t sectorNum = mfSectorNum(blockn & 0xff);
uint16_t uKeyNum = 0x4000 + sectorNum * 2 + (keyB ? 1 : 0);
keyn[0] = uKeyNum >> 8;
@@ -491,7 +412,7 @@ int CmdHFMFPRdbl(const char *cmd) {
}
if (datalen && data[0] != 0x90) {
- PrintAndLog("Card read error: %02x %s", data[0], GetErrorDescription(data[0]));
+ PrintAndLog("Card read error: %02x %s", data[0], mfpGetErrorDescription(data[0]));
return 6;
}
@@ -504,13 +425,13 @@ int CmdHFMFPRdbl(const char *cmd) {
for(int i = 0; i < blocksCount; i++) {
PrintAndLog("data[%03d]: %s", indx, sprint_hex(&data[1 + i * 16], 16));
indx++;
- if (mfIsSectorTrailer(indx)){
+ if (mfIsSectorTrailer(indx) && i != blocksCount - 1){
PrintAndLog("data[%03d]: ------------------- trailer -------------------", indx);
indx++;
}
}
- if (!memcmp(&data[blocksCount * 16 + 1], mac, 8)) {
+ if (memcmp(&data[blocksCount * 16 + 1], mac, 8)) {
PrintAndLog("WARNING: mac not equal...");
PrintAndLog("MAC card: %s", sprint_hex(&data[blocksCount * 16 + 1], 8));
PrintAndLog("MAC reader: %s", sprint_hex(mac, 8));
@@ -528,7 +449,7 @@ int CmdHFMFPRdsc(const char *cmd) {
int keylen = 0;
CLIParserInit("hf mfp rdsc",
- "Reads one sector from Mifare Plus card in plain mode.",
+ "Reads one sector from Mifare Plus card.",
"Usage:\n\thf mfp rdsc 0 000102030405060708090a0b0c0d0e0f -> executes authentication and read sector 0 data\n"
"\thf mfp rdsc 1 -v -> executes authentication and shows sector 1 data with default key 0xFF..0xFF and some additional data\n");
@@ -536,7 +457,7 @@ int CmdHFMFPRdsc(const char *cmd) {
arg_param_begin,
arg_lit0("vV", "verbose", "show internal data."),
arg_lit0("bB", "keyb", "use key B (by default keyA)."),
- arg_lit0("pP", "plain", "plain communication between reader and card."),
+ arg_lit0("pP", "plain", "plain communication mode between reader and card."),
arg_int1(NULL, NULL, "<Sector Num (0..255)>", NULL),
arg_str0(NULL, NULL, "<Key Value (HEX 16 bytes)>", NULL),
arg_param_end
@@ -545,12 +466,12 @@ int CmdHFMFPRdsc(const char *cmd) {
bool verbose = arg_get_lit(1);
bool keyB = arg_get_lit(2);
- bool plain = arg_get_lit(3) | true;
+ bool plain = arg_get_lit(3);
uint32_t sectorNum = arg_get_int(4);
CLIGetHexWithReturn(5, key, &keylen);
CLIParserFree();
- SetVerboseMode(verbose);
+ mfpSetVerboseMode(verbose);
if (!keylen) {
memmove(key, DefaultKey, 16);
@@ -592,7 +513,7 @@ int CmdHFMFPRdsc(const char *cmd) {
}
if (datalen && data[0] != 0x90) {
- PrintAndLog("Card read error: %02x %s", data[0], GetErrorDescription(data[0]));
+ PrintAndLog("Card read error: %02x %s", data[0], mfpGetErrorDescription(data[0]));
DropField();
return 6;
}
@@ -604,7 +525,7 @@ int CmdHFMFPRdsc(const char *cmd) {
PrintAndLog("data[%03d]: %s", n, sprint_hex(&data[1], 16));
- if (!memcmp(&data[1 + 16], mac, 8)) {
+ if (memcmp(&data[1 + 16], mac, 8)) {
PrintAndLog("WARNING: mac on block %d not equal...", n);
PrintAndLog("MAC card: %s", sprint_hex(&data[1 + 16], 8));
PrintAndLog("MAC reader: %s", sprint_hex(mac, 8));
@@ -648,7 +569,7 @@ int CmdHFMFPWrbl(const char *cmd) {
CLIGetHexWithReturn(5, key, &keylen);
CLIParserFree();
- SetVerboseMode(verbose);
+ mfpSetVerboseMode(verbose);
if (!keylen) {
memmove(key, DefaultKey, 16);
@@ -701,12 +622,12 @@ int CmdHFMFPWrbl(const char *cmd) {
}
if (datalen && data[0] != 0x90) {
- PrintAndLog("Card write error: %02x %s", data[0], GetErrorDescription(data[0]));
+ PrintAndLog("Card write error: %02x %s", data[0], mfpGetErrorDescription(data[0]));
DropField();
return 6;
}
- if (!memcmp(&data[1], mac, 8)) {
+ if (memcmp(&data[1], mac, 8)) {
PrintAndLog("WARNING: mac not equal...");
PrintAndLog("MAC card: %s", sprint_hex(&data[1], 8));
PrintAndLog("MAC reader: %s", sprint_hex(mac, 8));
@@ -716,9 +637,208 @@ int CmdHFMFPWrbl(const char *cmd) {
}
DropField();
+ PrintAndLog("Write OK.");
return 0;
}
+int CmdHFMFPMAD(const char *cmd) {
+
+ CLIParserInit("hf mfp mad",
+ "Checks and prints Mifare Application Directory (MAD)",
+ "Usage:\n\thf mfp mad -> shows MAD if exists\n"
+ "\thf mfp mad -a 03e1 -k d3f7d3f7d3f7d3f7d3f7d3f7d3f7d3f7 -> shows NDEF data if exists\n");
+
+ void *argtable[] = {
+ arg_param_begin,
+ arg_lit0("vV", "verbose", "show technical data"),
+ arg_str0("aA", "aid", "print all sectors with aid", NULL),
+ arg_str0("kK", "key", "key for printing sectors", NULL),
+ arg_lit0("bB", "keyb", "use key B for access printing sectors (by default: key A)"),
+ arg_param_end
+ };
+ CLIExecWithReturn(cmd, argtable, true);
+
+ bool verbose = arg_get_lit(1);
+ uint8_t aid[2] = {0};
+ int aidlen;
+ CLIGetHexWithReturn(2, aid, &aidlen);
+ uint8_t key[16] = {0};
+ int keylen;
+ CLIGetHexWithReturn(3, key, &keylen);
+ bool keyB = arg_get_lit(4);
+
+ CLIParserFree();
+
+ if (aidlen != 2 && keylen > 0) {
+ PrintAndLogEx(WARNING, "do not need a key without aid.");
+ }
+
+ uint8_t sector0[16 * 4] = {0};
+ uint8_t sector10[16 * 4] = {0};
+
+ if (mfpReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifarep_mad_key, sector0, verbose)) {
+ PrintAndLogEx(NORMAL, "");
+ PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
+ return 2;
+ }
+
+ if (verbose) {
+ for (int i = 0; i < 4; i ++)
+ PrintAndLogEx(NORMAL, "[%d] %s", i, sprint_hex(§or0[i * 16], 16));
+ }
+
+ bool haveMAD2 = false;
+ MAD1DecodeAndPrint(sector0, verbose, &haveMAD2);
+
+ if (haveMAD2) {
+ if (mfpReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifarep_mad_key, sector10, verbose)) {
+ PrintAndLogEx(NORMAL, "");
+ PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
+ return 2;
+ }
+
+ MAD2DecodeAndPrint(sector10, verbose);
+ }
+
+ if (aidlen == 2) {
+ uint16_t aaid = (aid[0] << 8) + aid[1];
+ PrintAndLogEx(NORMAL, "\n-------------- AID 0x%04x ---------------", aaid);
+
+ uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};
+ size_t madlen = 0;
+ if (MADDecode(sector0, sector10, mad, &madlen)) {
+ PrintAndLogEx(ERR, "can't decode mad.");
+ return 10;
+ }
+
+ uint8_t akey[16] = {0};
+ memcpy(akey, g_mifarep_ndef_key, 16);
+ if (keylen == 16) {
+ memcpy(akey, key, 16);
+ }
+
+ for (int i = 0; i < madlen; i++) {
+ if (aaid == mad[i]) {
+ uint8_t vsector[16 * 4] = {0};
+ if (mfpReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, akey, vsector, false)) {
+ PrintAndLogEx(NORMAL, "");
+ PrintAndLogEx(ERR, "read sector %d error.", i + 1);
+ return 2;
+ }
+
+ for (int j = 0; j < (verbose ? 4 : 3); j ++)
+ PrintAndLogEx(NORMAL, " [%03d] %s", (i + 1) * 4 + j, sprint_hex(&vsector[j * 16], 16));
+ }
+ }
+ }
+
+ return 0;
+}
+
+int CmdHFMFPNDEF(const char *cmd) {
+
+ CLIParserInit("hf mfp ndef",
+ "Prints NFC Data Exchange Format (NDEF)",
+ "Usage:\n\thf mfp ndef -> shows NDEF data\n"
+ "\thf mfp ndef -a 03e1 -k d3f7d3f7d3f7d3f7d3f7d3f7d3f7d3f7 -> shows NDEF data with custom AID and key\n");
+
+ void *argtable[] = {
+ arg_param_begin,
+ arg_litn("vV", "verbose", 0, 2, "show technical data"),
+ arg_str0("aA", "aid", "replace default aid for NDEF", NULL),
+ arg_str0("kK", "key", "replace default key for NDEF", NULL),
+ arg_lit0("bB", "keyb", "use key B for access sectors (by default: key A)"),
+ arg_param_end
+ };
+ CLIExecWithReturn(cmd, argtable, true);
+
+ bool verbose = arg_get_lit(1);
+ bool verbose2 = arg_get_lit(1) > 1;
+ uint8_t aid[2] = {0};
+ int aidlen;
+ CLIGetHexWithReturn(2, aid, &aidlen);
+ uint8_t key[16] = {0};
+ int keylen;
+ CLIGetHexWithReturn(3, key, &keylen);
+ bool keyB = arg_get_lit(4);
+
+ CLIParserFree();
+
+ uint16_t ndefAID = 0x03e1;
+ if (aidlen == 2)
+ ndefAID = (aid[0] << 8) + aid[1];
+
+ uint8_t ndefkey[16] = {0};
+ memcpy(ndefkey, g_mifarep_ndef_key, 16);
+ if (keylen == 16) {
+ memcpy(ndefkey, key, 16);
+ }
+
+ uint8_t sector0[16 * 4] = {0};
+ uint8_t sector10[16 * 4] = {0};
+ uint8_t data[4096] = {0};
+ int datalen = 0;
+
+ PrintAndLogEx(NORMAL, "");
+
+ if (mfpReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifarep_mad_key, sector0, verbose)) {
+ PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
+ return 2;
+ }
+
+ bool haveMAD2 = false;
+ int res = MADCheck(sector0, NULL, verbose, &haveMAD2);
+ if (res) {
+ PrintAndLogEx(ERR, "MAD error %d.", res);
+ return res;
+ }
+
+ if (haveMAD2) {
+ if (mfpReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifarep_mad_key, sector10, verbose)) {
+ PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
+ return 2;
+ }
+ }
+
+ uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};
+ size_t madlen = 0;
+ if (MADDecode(sector0, (haveMAD2 ? sector10 : NULL), mad, &madlen)) {
+ PrintAndLogEx(ERR, "can't decode mad.");
+ return 10;
+ }
+
+ printf("data reading:");
+ for (int i = 0; i < madlen; i++) {
+ if (ndefAID == mad[i]) {
+ uint8_t vsector[16 * 4] = {0};
+ if (mfpReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, ndefkey, vsector, false)) {
+ PrintAndLogEx(ERR, "read sector %d error.", i + 1);
+ return 2;
+ }
+
+ memcpy(&data[datalen], vsector, 16 * 3);
+ datalen += 16 * 3;
+
+ printf(".");
+ }
+ }
+ printf(" OK\n");
+
+ if (!datalen) {
+ PrintAndLogEx(ERR, "no NDEF data.");
+ return 11;
+ }
+
+ if (verbose2) {
+ PrintAndLogEx(NORMAL, "NDEF data:");
+ dump_buffer(data, datalen, stdout, 1);
+ }
+
+ NDEFDecodeAndPrint(data, datalen, verbose);
+
+ return 0;
+}
+
static command_t CommandTable[] =
{
{"help", CmdHelp, 1, "This help"},
@@ -729,7 +849,9 @@ static command_t CommandTable[] =
{"auth", CmdHFMFPAuth, 0, "Authentication"},
{"rdbl", CmdHFMFPRdbl, 0, "Read blocks"},
{"rdsc", CmdHFMFPRdsc, 0, "Read sectors"},
-// {"wrbl", CmdHFMFPWrbl, 0, "Write blocks"},
+ {"wrbl", CmdHFMFPWrbl, 0, "Write blocks"},
+ {"mad", CmdHFMFPMAD, 0, "Checks and prints MAD"},
+ {"ndef", CmdHFMFPNDEF, 0, "Prints NDEF records from card"},
{NULL, NULL, 0, NULL}
};