X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/a9eeb576983f932ee622554ccd4e08be10e695b5..ece631fd06bfc1de1ca017c9c8154d4447f98cdb:/client/cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index ede88cb7..13cbee68 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -340,7 +340,7 @@ int CmdHF14AMfRdBl(const char *Cmd) {
 	SendCommand(&c);
 
 	UsbCommand resp;
-	if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
 		uint8_t isOK  = resp.arg[0] & 0xff;
 		uint8_t *data = resp.d.asBytes;
 
@@ -721,7 +721,7 @@ int CmdHF14AMfRestore(const char *Cmd) {
 
 int CmdHF14AMfNested(const char *Cmd) {
 	int i, j, res, iterations;
-	sector *e_sector = NULL;
+	sector_t *e_sector = NULL;
 	uint8_t blockNo = 0;
 	uint8_t keyType = 0;
 	uint8_t trgBlockNo = 0;
@@ -823,7 +823,7 @@ int CmdHF14AMfNested(const char *Cmd) {
 		time_t start, end;
 		time(&start);
 		
-		e_sector = calloc(SectorsCnt, sizeof(sector));
+		e_sector = calloc(SectorsCnt, sizeof(sector_t));
 		if (e_sector == NULL) return 1;
 		
 		//test current key and additional standard keys first
@@ -1083,7 +1083,7 @@ int CmdHF14AMfChk(const char *Cmd) {
 	uint8_t *keyBlock = NULL, *p;
 	uint8_t stKeyBlock = 20;
 	
-	sector *e_sector = NULL;
+	sector_t *e_sector = NULL;
 	
 	int i, res;
 	int	keycnt = 0;
@@ -1230,7 +1230,7 @@ int CmdHF14AMfChk(const char *Cmd) {
 	}
 	
 	// initialize storage for found keys
-	e_sector = calloc(SectorsCnt, sizeof(sector));
+	e_sector = calloc(SectorsCnt, sizeof(sector_t));
 	if (e_sector == NULL) {
 		free(keyBlock);
 		return 1;
@@ -1362,13 +1362,13 @@ int CmdHF14AMfChk(const char *Cmd) {
 	return 0;
 }
 
-sector *k_sector = NULL;
+sector_t *k_sector = NULL;
 uint8_t k_sectorsCount = 16;
 static void emptySectorTable(){
 
 	// initialize storage for found keys
 	if (k_sector == NULL)
-		k_sector = calloc(k_sectorsCount, sizeof(sector));
+		k_sector = calloc(k_sectorsCount, sizeof(sector_t));
 	if (k_sector == NULL) 
 		return;
 		
@@ -1720,7 +1720,7 @@ int CmdHF14AMfKeyBrute(const char *Cmd) {
 	return 0;	
 }
 
-void printKeyTable( uint8_t sectorscnt, sector *e_sector ){
+void printKeyTable( uint8_t sectorscnt, sector_t *e_sector ){
 	PrintAndLog("|---|----------------|---|----------------|---|");
 	PrintAndLog("|sec|key A           |res|key B           |res|");
 	PrintAndLog("|---|----------------|---|----------------|---|");
@@ -2451,6 +2451,43 @@ int CmdHf14MfDecryptBytes(const char *Cmd){
 	return tryDecryptWord( nt, ar_enc, at_enc, data, len);
 }
 
+int CmdHf14AMfSetMod(const char *Cmd) {
+	uint8_t key[6] = {0, 0, 0, 0, 0, 0};
+	uint8_t mod = 2;
+
+	char ctmp = param_getchar(Cmd, 0);
+	if (ctmp == '0') {
+		mod = 0;
+	} else if (ctmp == '1') {
+		mod = 1;
+	}
+	int gethexfail = param_gethex(Cmd, 1, key, 12);
+	if (mod == 2 || gethexfail) {
+		PrintAndLog("Sets the load modulation strength of a MIFARE Classic EV1 card.");
+		PrintAndLog("Usage: hf mf setmod <0/1> <block 0 key A>");
+		PrintAndLog("       0 = normal modulation");
+		PrintAndLog("       1 = strong modulation (default)");
+		return 1;
+	}
+
+	UsbCommand c = {CMD_MIFARE_SETMOD, {mod, 0, 0}};
+	memcpy(c.d.asBytes, key, 6);
+	clearCommandBuffer();
+	SendCommand(&c);
+
+	UsbCommand resp;
+	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+		uint8_t ok = resp.arg[0] & 0xff;
+		PrintAndLog("isOk:%02x", ok);
+		if (!ok) {
+			PrintAndLog("Failed.");
+		}
+	} else {
+		PrintAndLog("Command execute timeout");
+	}
+	return 0;
+}
+
 static command_t CommandTable[] = {
 	{"help",		CmdHelp,				1, "This help"},
 	{"dbg",			CmdHF14AMfDbg,			0, "Set default debug mode"},
@@ -2480,6 +2517,7 @@ static command_t CommandTable[] = {
 	{"cload",		CmdHF14AMfCLoad,		0, "Load dump into magic Chinese card"},
 	{"csave",		CmdHF14AMfCSave,		0, "Save dump from magic Chinese card into file or emulator"},
 	{"decrypt",		CmdHf14MfDecryptBytes,  1, "[nt] [ar_enc] [at_enc] [data] - to decrypt snoop or trace"},
+	{"setmod",		CmdHf14AMfSetMod, 		0, "Set MIFARE Classic EV1 load modulation strength"},
 	{NULL, NULL, 0, NULL}
 };