X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/28415b5d902e391b5bbfd615b3a42d8cffbb0ce3..98b2a3a1e9829f85f1df6afa59a0803bfdca37ed:/client/cmdhf14a.c diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c index 6d94d33b..33a4234c 100644 --- a/client/cmdhf14a.c +++ b/client/cmdhf14a.c @@ -27,8 +27,6 @@ #include "nonce2key/nonce2key.h" #include "cmdhf.h" -#define llx PRIx64 - static int CmdHelp(const char *Cmd); static void waitCmd(uint8_t iLen); @@ -576,7 +574,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); + //tryMfk32_moebius(uid, data, key); //tryMfk64(uid, data, key); PrintAndLog("--"); } @@ -735,7 +733,7 @@ int CmdHF14ACmdRaw(const char *cmd) { // Max buffer is USB_CMD_DATA_SIZE datalen = (datalen > USB_CMD_DATA_SIZE) ? USB_CMD_DATA_SIZE : datalen; - c.arg[1] = (datalen & 0xFFFF) | (numbits << 16); + c.arg[1] = (datalen & 0xFFFF) | (uint32_t)(numbits << 16); memcpy(c.d.asBytes,data,datalen); clearCommandBuffer();