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

refactoring

Browse source
This commit is contained in:
merlokk 2018-10-18 20:35:28 +03:00
commit 1b4e5e0ecc
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
client/cmdhfmfp.c
View file

@ -32,14 +32,11 @@ void SetVerboseMode(bool verbose) {
VerboseMode = verbose; VerboseMode = verbose;
} }
int MFPWritePerso(uint8_t *keyNum, uint8_t *key, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) { int intExchangeRAW14aPlus(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
uint8_t rcmd[3 + 16] = {0xa8, keyNum[1], keyNum[0], 0x00};
memmove(&rcmd[3], key, 16);
if(VerboseMode) if(VerboseMode)
PrintAndLog(">>> %s", sprint_hex(rcmd, sizeof(rcmd))); PrintAndLog(">>> %s", sprint_hex(datain, datainlen));
int res = ExchangeRAW14a(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen); int res = ExchangeRAW14a(datain, datainlen, activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
if(VerboseMode) if(VerboseMode)
PrintAndLog("<<< %s", sprint_hex(dataout, *dataoutlen)); PrintAndLog("<<< %s", sprint_hex(dataout, *dataoutlen));
@ -47,6 +44,13 @@ int MFPWritePerso(uint8_t *keyNum, uint8_t *key, bool activateField, bool leaveS
return res; return res;
} }
int MFPWritePerso(uint8_t *keyNum, uint8_t *key, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
uint8_t rcmd[3 + 16] = {0xa8, keyNum[1], keyNum[0], 0x00};
memmove(&rcmd[3], key, 16);
return intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
}
int CmdHFMFPInfo(const char *cmd) { int CmdHFMFPInfo(const char *cmd) {
if (cmd && strlen(cmd) > 0) if (cmd && strlen(cmd) > 0)