github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-24 06:55:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

small fixes

Browse source
This commit is contained in:
merlokk 2018-10-12 14:32:03 +03:00
commit 2793873e16
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
client/cmdhfmfp.c
View file

@ -25,9 +25,14 @@
static int CmdHelp(const char *Cmd); static int CmdHelp(const char *Cmd);
int CmdHFMFPInfo(const char *cmd) { int CmdHFMFPInfo(const char *cmd) {
if (cmd && strlen(cmd) > 0)
PrintAndLog("WARNING: command don't have any parameters.\n");
// info about 14a part // info about 14a part
CmdHF14AInfo(""); CmdHF14AInfo("");
// Mifare Plus info
UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}}; UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
SendCommand(&c); SendCommand(&c);
@ -77,7 +82,7 @@ int CmdHFMFPInfo(const char *cmd) {
uint8_t data[250] = {0}; uint8_t data[250] = {0};
int datalen = 0; int datalen = 0;
// https://github.com/Proxmark/proxmark3/blob/master/client/scripts/mifarePlus.lua#L161 // https://github.com/Proxmark/proxmark3/blob/master/client/scripts/mifarePlus.lua#L161
uint8_t cmd[16 + 5] = {0x0a, 0x00, 0xa8, 0x90, 0x90, 0x00}; uint8_t cmd[5 + 16] = {0x0a, 0x00, 0xa8, 0x90, 0x90, 0x00};
int res = ExchangeRAW14a(cmd, sizeof(cmd), false, false, data, sizeof(data), &datalen); int res = ExchangeRAW14a(cmd, sizeof(cmd), false, false, data, sizeof(data), &datalen);
if (!res && datalen > 2 && data[2] == 0x09) { if (!res && datalen > 2 && data[2] == 0x09) {
SLmode = 0; SLmode = 0;
@ -89,7 +94,9 @@ int CmdHFMFPInfo(const char *cmd) {
PrintAndLog("Mifare Plus SL mode: SL%d", SLmode); PrintAndLog("Mifare Plus SL mode: SL%d", SLmode);
else else
PrintAndLog("Mifare Plus SL mode: unknown("); PrintAndLog("Mifare Plus SL mode: unknown(");
}; } else {
PrintAndLog("Mifare Plus info not available.");
}
DropField(); DropField();
@ -112,4 +119,4 @@ int CmdHFMFP(const char *Cmd) {
int CmdHelp(const char *Cmd) { int CmdHelp(const char *Cmd) {
CmdsHelp(CommandTable); CmdsHelp(CommandTable);
return 0; return 0;
} }