X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/5eae566a28d4494e70a9e3812e269dbd87d9bc07..f605970307d2b72a7686510f2454a58c7693e703:/client/cmdhfmf.c
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 72cbf8f7..1b815326 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -96,7 +96,8 @@ int CmdHF14AMfWrBl(const char *Cmd)
uint8_t blockNo = 0;
uint8_t keyType = 0;
uint8_t key[6] = {0, 0, 0, 0, 0, 0};
- uint8_t bldata[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+ uint8_t bldata[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+
char cmdp = 0x00;
if (strlen(Cmd)<3) {
@@ -123,10 +124,10 @@ int CmdHF14AMfWrBl(const char *Cmd)
PrintAndLog("--block no:%d, key type:%c, key:%s", blockNo, keyType?'B':'A', sprint_hex(key, 6));
PrintAndLog("--data: %s", sprint_hex(bldata, 16));
- UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};
+ UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};
memcpy(c.d.asBytes, key, 6);
memcpy(c.d.asBytes + 10, bldata, 16);
- SendCommand(&c);
+ SendCommand(&c);
UsbCommand resp;
if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
@@ -143,9 +144,11 @@ int CmdHF14AMfRdBl(const char *Cmd)
{
uint8_t blockNo = 0;
uint8_t keyType = 0;
- uint8_t key[6] = {0, 0, 0, 0, 0, 0};
+ uint8_t key[6] = {0, 0, 0, 0, 0, 0};
+
char cmdp = 0x00;
+
if (strlen(Cmd)<3) {
PrintAndLog("Usage: hf mf rdbl <block number> <key A/B> <key (12 hex symbols)>");
PrintAndLog(" sample: hf mf rdbl 0 A FFFFFFFFFFFF ");
@@ -165,9 +168,9 @@ int CmdHF14AMfRdBl(const char *Cmd)
}
PrintAndLog("--block no:%d, key type:%c, key:%s ", blockNo, keyType?'B':'A', sprint_hex(key, 6));
- UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};
+ UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};
memcpy(c.d.asBytes, key, 6);
- SendCommand(&c);
+ SendCommand(&c);
UsbCommand resp;
if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
@@ -429,13 +432,13 @@ int CmdHF14AMfDump(const char *Cmd)
int CmdHF14AMfRestore(const char *Cmd)
{
- uint8_t sectorNo,blockNo = 0;
+ uint8_t sectorNo,blockNo;
uint8_t keyType = 0;
uint8_t key[6] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
uint8_t bldata[16] = {0x00};
uint8_t keyA[40][6];
uint8_t keyB[40][6];
- uint8_t numSectors = 0;
+ uint8_t numSectors;
FILE *fdump;
FILE *fkeys;
@@ -544,13 +547,15 @@ int CmdHF14AMfNested(const char *Cmd)
uint8_t trgKeyType = 0;
uint8_t SectorsCnt = 0;
uint8_t key[6] = {0, 0, 0, 0, 0, 0};
- uint8_t keyBlock[13*6];
+ uint8_t keyBlock[14*6];
uint64_t key64 = 0;
bool transferToEml = false;
+
bool createDumpFile = false;
FILE *fkeys;
uint8_t standart[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+
char cmdp, ctmp;
if (strlen(Cmd)<3) {
@@ -681,6 +686,7 @@ int CmdHF14AMfNested(const char *Cmd)
}
}
}
+
// nested sectors
iterations = 0;
PrintAndLog("nested...");
@@ -775,8 +781,8 @@ int CmdHF14AMfChk(const char *Cmd)
PrintAndLog("Usage: hf mf chk <block number>|<*card memory> <key type (A/B/?)> [t|d] [<key (12 hex symbols)>] [<dic (*.dic)>]");
PrintAndLog(" * - all sectors");
PrintAndLog("card memory - 0 - MINI(320 bytes), 1 - 1K, 2 - 2K, 4 - 4K, <other> - 1K");
- PrintAndLog("d - write keys to binary file\n");
- PrintAndLog("t - write keys to emulator memory");
+ PrintAndLog("d - write keys to binary file");
+ PrintAndLog("t - write keys to emulator memory\n");
PrintAndLog(" sample: hf mf chk 0 A 1234567890ab keys.dic");
PrintAndLog(" hf mf chk *1 ? t");
PrintAndLog(" hf mf chk *1 ? d");
@@ -785,7 +791,7 @@ int CmdHF14AMfChk(const char *Cmd)
FILE * f;
char filename[FILE_PATH_SIZE]={0};
- char buf[13] = {0x00};
+ char buf[13];
uint8_t *keyBlock = NULL, *p;
uint8_t stKeyBlock = 20;
@@ -1017,7 +1023,6 @@ int CmdHF14AMf1kSim(const char *Cmd)
PrintAndLog(" x (Optional) Crack, performs the 'reader attack', nr/ar attack against a legitimate reader, fishes out the key(s)");
PrintAndLog("");
PrintAndLog(" sample: hf mf sim u 0a0a0a0a ");
- PrintAndLog(" : hf mf sim u 0a0a0a0a i x");
return 0;
}
uint8_t pnr = 0;
@@ -1133,9 +1138,11 @@ int CmdHF14AMfEClear(const char *Cmd)
int CmdHF14AMfESet(const char *Cmd)
{
- uint8_t memBlock[16] = {0x00};
+ uint8_t memBlock[16];
uint8_t blockNo = 0;
+ memset(memBlock, 0x00, sizeof(memBlock));
+
if (strlen(Cmd) < 3 || param_getchar(Cmd, 0) == 'h') {
PrintAndLog("Usage: hf mf eset <block number> <block data (32 hex symbols)>");
PrintAndLog(" sample: hf mf eset 1 000102030405060708090a0b0c0d0e0f ");
@@ -1160,7 +1167,7 @@ int CmdHF14AMfESet(const char *Cmd)
int CmdHF14AMfELoad(const char *Cmd)
{
FILE * f;
- char filename[FILE_PATH_SIZE] = {0x00};
+ char filename[FILE_PATH_SIZE];
char *fnameptr = filename;
char buf[64] = {0x00};
uint8_t buf8[64] = {0x00};
@@ -1195,7 +1202,7 @@ int CmdHF14AMfELoad(const char *Cmd)
if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
- fnameptr += len;
+ fnameptr += len-4;
sprintf(fnameptr, ".eml");
@@ -1256,9 +1263,9 @@ int CmdHF14AMfELoad(const char *Cmd)
int CmdHF14AMfESave(const char *Cmd)
{
FILE * f;
- char filename[FILE_PATH_SIZE] = {0x00};
+ char filename[FILE_PATH_SIZE];
char * fnameptr = filename;
- uint8_t buf[64] = {0x00};
+ uint8_t buf[64];
int i, j, len, numBlocks;
int nameParamNo = 1;
@@ -1304,7 +1311,7 @@ int CmdHF14AMfESave(const char *Cmd)
for (j = 0; j < 7; j++, fnameptr += 2)
sprintf(fnameptr, "%02X", buf[j]);
} else {
- fnameptr += len;
+ fnameptr += len-4;
}
// add file extension
@@ -1380,8 +1387,8 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
{
int i;
uint8_t numSectors;
- uint8_t data[16] = {0x00};
- uint64_t keyA, keyB = 0;
+ uint8_t data[16];
+ uint64_t keyA, keyB;
if (param_getchar(Cmd, 0) == 'h') {
PrintAndLog("It prints the keys loaded in the emulator memory");
@@ -1495,13 +1502,13 @@ int CmdHF14AMfCSetBlk(const char *Cmd)
uint8_t memBlock[16] = {0x00};
uint8_t blockNo = 0;
bool wipeCard = FALSE;
- int res = 0;
+ int res;
if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {
PrintAndLog("Usage: hf mf csetblk <block number> <block data (32 hex symbols)> [w]");
PrintAndLog("sample: hf mf csetblk 1 01020304050607080910111213141516");
PrintAndLog("Set block data for magic Chinese card (only works with such cards)");
- PrintAndLog("If you also want to wipe the card then add 'w' at the end of the command line.");
+ PrintAndLog("If you also want wipe the card then add 'w' at the end of the command line");
return 0;
}
@@ -1514,14 +1521,13 @@ int CmdHF14AMfCSetBlk(const char *Cmd)
char ctmp = param_getchar(Cmd, 2);
wipeCard = (ctmp == 'w' || ctmp == 'W');
-
PrintAndLog("--block number:%2d data:%s", blockNo, sprint_hex(memBlock, 16));
res = mfCSetBlock(blockNo, memBlock, NULL, wipeCard, CSETBLOCK_SINGLE_OPER);
if (res) {
PrintAndLog("Can't write block. error=%d", res);
return 1;
- }
+ }
return 0;
}
@@ -1569,7 +1575,7 @@ int CmdHF14AMfCLoad(const char *Cmd)
if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
memcpy(filename, Cmd, len);
- fnameptr += len;
+ fnameptr += len-4;
sprintf(fnameptr, ".eml");
@@ -1587,6 +1593,7 @@ int CmdHF14AMfCLoad(const char *Cmd)
if (fgets(buf, sizeof(buf), f) == NULL) {
PrintAndLog("File reading error.");
+ fclose(f);
return 2;
}
@@ -1594,6 +1601,7 @@ int CmdHF14AMfCLoad(const char *Cmd)
if(strlen(buf) && feof(f))
break;
PrintAndLog("File content error. Block data must include 32 HEX symbols");
+ fclose(f);
return 2;
}
for (i = 0; i < 32; i += 2)
@@ -1624,9 +1632,10 @@ int CmdHF14AMfCLoad(const char *Cmd)
}
int CmdHF14AMfCGetBlk(const char *Cmd) {
- uint8_t memBlock[16] = {0x00};
+ uint8_t memBlock[16];
uint8_t blockNo = 0;
int res;
+ memset(memBlock, 0x00, sizeof(memBlock));
if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {
PrintAndLog("Usage: hf mf cgetblk <block number>");
@@ -1793,7 +1802,7 @@ int CmdHF14AMfSniff(const char *Cmd){
int blockLen = 0;
int pckNum = 0;
int num = 0;
- uint8_t uid[7] = {0x00};
+ uint8_t uid[7];
uint8_t uid_len;
uint8_t atqa[2] = {0x00};
uint8_t sak;