chg: hf mf setmod - uses NG

This commit is contained in:
iceman1001
2019-05-15 06:52:22 -04:00
parent 41acc98d87
commit 65ff4f0e92
5 changed files with 24 additions and 33 deletions

View File

@@ -3205,19 +3205,25 @@ static int CmdHf14AMfSetMod(const char *Cmd) {
return 1;
}
uint8_t data[7];
data[0] = mod;
memcpy(data+1, key, 6);
clearCommandBuffer();
SendCommandOLD(CMD_MIFARE_SETMOD, mod, 0, 0, key, 6);
SendCommandNG(CMD_MIFARE_SETMOD, data, sizeof(data));
PacketResponseNG resp;
if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
uint8_t ok = resp.oldarg[0] & 0xff;
PrintAndLogEx(SUCCESS, "isOk:%02x", ok);
if (!ok)
PrintAndLogEx(FAILED, "Failed.");
if (WaitForResponseTimeout(CMD_MIFARE_SETMOD, &resp, 1500)) {
if (resp.status == PM3_SUCCESS)
PrintAndLogEx(SUCCESS, "Success");
else
PrintAndLogEx(FAILED, "Failed");
} else {
PrintAndLogEx(WARNING, "Command execute timeout");
}
return 0;
return PM3_SUCCESS;
}
// Mifare NACK bug detection

View File

@@ -912,26 +912,8 @@ int detect_classic_nackbug(bool verbose) {
if (verbose)
PrintAndLogEx(SUCCESS, "press pm3-button on the Proxmark3 device to abort both Proxmark3 and client.\n");
// for nice animation
bool term = !isatty(STDIN_FILENO);
#if defined(__linux__) || (__APPLE__)
char star[] = {'-', '\\', '|', '/'};
uint8_t staridx = 0;
#endif
while (true) {
if (term) {
printf(".");
} else {
printf(
#if defined(__linux__) || (__APPLE__)
_GREEN_("\e[s%c\e[u"), star[(staridx++ % 4) ]
#else
"."
#endif
);
}
printf(".");
fflush(stdout);
if (ukbhit()) {
int gc = getchar();