}\r
\r
int mfCSetUID(uint8_t *uid, uint8_t *oldUID, int wantWipe) {\r
- uint8_t isOK = 0;\r
uint8_t block0[16];\r
memset(block0, 0, 16);\r
memcpy(block0, uid, 4); \r
block0[4] = block0[0]^block0[1]^block0[2]^block0[3]; // Mifare UID BCC\r
+ \r
+ return mfCSetBlock(0, block0, oldUID, wantWipe);\r
+}\r
+\r
+int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, int wantWipe) {\r
+ uint8_t isOK = 0;\r
\r
- UsbCommand c = {CMD_MIFARE_EML_CSETBLOCK, {wantWipe, 1, 0}};\r
- memcpy(c.d.asBytes, block0, 16); \r
+ UsbCommand c = {CMD_MIFARE_EML_CSETBLOCK, {wantWipe, 1, blockNo}};\r
+ memcpy(c.d.asBytes, data, 16); \r
SendCommand(&c);\r
\r
UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
if (resp != NULL) {\r
isOK = resp->arg[0] & 0xff;\r
PrintAndLog("isOk:%02x", isOK);\r
- memcpy(oldUID, resp->d.asBytes, 4); \r
+ memcpy(uid, resp->d.asBytes, 4); \r
if (!isOK) return 2;\r
} else {\r
PrintAndLog("Command execute timeout");\r