X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/c3c241f389048bd14422d70504cecec6637b89f3..7838f4beba79370f94c7a3de2cf34278f5d481c8:/client/cmdhf14a.c diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c index 931ef990..8a6e6afd 100644 --- a/client/cmdhf14a.c +++ b/client/cmdhf14a.c @@ -464,6 +464,7 @@ static int usage_hf_14a_sim(void) PrintAndLog(" 4 = ISO/IEC 14443-4"); PrintAndLog(" 5 = MIFARE Tnp3xxx"); PrintAndLog(" 6 = MIFARE Mini"); + PrintAndLog(" 7 = AMIIBO (NTAG 215), pack 0x8080"); PrintAndLog(" u : 4 or 7 byte UID"); PrintAndLog(" x : (Optional) performs the 'reader attack', nr/ar attack against a legitimate reader"); PrintAndLog("\n sample : hf 14a sim t 1 u 1122344"); @@ -548,6 +549,7 @@ int CmdHF14ASim(const char *Cmd) int len = (resp.arg[1] > sizeof(data)) ? sizeof(data) : resp.arg[1]; memcpy(data, resp.d.asBytes, len); tryMfk32(uid, data, key); + tryMfk32_moebius(uid, data, key); //tryMfk64(uid, data, key); PrintAndLog("--"); } @@ -725,6 +727,7 @@ int CmdHF14ACmdRaw(const char *cmd) { c.arg[1] = (datalen & 0xFFFF) | (numbits << 16); memcpy(c.d.asBytes,data,datalen); + clearCommandBuffer(); SendCommand(&c); if (reply) {