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

small fix 'hf mf csetuid'

Browse source
This commit is contained in:
merlokk 2017-07-26 16:56:14 +03:00
commit 8d1679a22a
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
client/mifarehost.c
View file

@ -437,8 +437,8 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uin
memcpy(c.d.asBytes, data, 16); memcpy(c.d.asBytes, data, 16);
SendCommand(&c); SendCommand(&c);
UsbCommand resp; UsbCommand resp;
if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) { if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
isOK = resp.arg[0] & 0xff; isOK = resp.arg[0] & 0xff;
if (uid != NULL) if (uid != NULL)
memcpy(uid, resp.d.asBytes, 4); memcpy(uid, resp.d.asBytes, 4);
@ -448,6 +448,7 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uin
PrintAndLog("Command execute timeout"); PrintAndLog("Command execute timeout");
return 1; return 1;
} }
return 0; return 0;
} }
@ -456,7 +457,6 @@ int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, bool w
uint8_t block0[16] = {0x00}; uint8_t block0[16] = {0x00};
uint8_t block1[16] = {0x00}; uint8_t block1[16] = {0x00};
uint8_t blockK[16] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x08, 0x77, 0x8F, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; uint8_t blockK[16] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x08, 0x77, 0x8F, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
uint8_t blockt[16] = {0x00};
int gen = 0, res; int gen = 0, res;
gen = mfCIdentify(); gen = mfCIdentify();
@ -493,7 +493,7 @@ int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, bool w
res = mfCSetBlock(0, block0, oldUID, wantWipe, cmdParams); res = mfCSetBlock(0, block0, oldUID, wantWipe, cmdParams);
if (res) { if (res) {
PrintAndLog("Can't set block 0. Error: %s", res); PrintAndLog("Can't set block 0. Error: %d", res);
return res; return res;
} }
@ -503,9 +503,9 @@ int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, bool w
printf("write blocks "); printf("write blocks ");
while (blockNo < 64) { while (blockNo < 64) {
if ((blockNo + 1) % 4) { if ((blockNo + 1) % 4) {
res = mfCSetBlock(blockNo, block1, blockt, false, cmdParams); res = mfCSetBlock(blockNo, block1, NULL, false, cmdParams);
} else { } else {
res = mfCSetBlock(blockNo, blockK, blockt, false, cmdParams); res = mfCSetBlock(blockNo, blockK, NULL, false, cmdParams);
printf("."); printf(".");
} }
if (res) { if (res) {