RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-20 15:26:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

text

Browse source
This commit is contained in:
iceman1001 2024-01-25 01:45:18 +01:00
parent 9b3a088f58
commit 28b887aedb
2 changed files with 38 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
armsrc/iso15693.c
View file

@ -2138,11 +2138,14 @@ void SimTagIso15693(uint8_t *uid, uint8_t block_size) {
return;
}
// new tag (need initialization)
if (uid != NULL) {
uint8_t empty[8] = { 0 };
if (memcmp(uid, empty, 8) != 0) {
// simulate a new tag bazed on client parameters
// User supplied not empty?
if (memcmp(uid, empty, 8)) {
// Set default values if user supplied a UID.
// Assume emulator memory is empty
tag->uid[0] = uid[7]; // always E0
tag->uid[1] = uid[6]; // IC Manufacturer code
tag->uid[2] = uid[5];
@ -2164,20 +2167,33 @@ void SimTagIso15693(uint8_t *uid, uint8_t block_size) {
}
}
if (tag->pagesCount > ISO15693_TAG_MAX_PAGES || \
tag->pagesCount * tag->bytesPerPage > ISO15693_TAG_MAX_SIZE ||
tag->pagesCount == 0 || tag->bytesPerPage == 0) {
if ((tag->pagesCount > ISO15693_TAG_MAX_PAGES) ||
((tag->pagesCount * tag->bytesPerPage) > ISO15693_TAG_MAX_SIZE) ||
(tag->pagesCount == 0) ||
(tag->bytesPerPage == 0)) {
Dbprintf("Tag size error: pagesCount = %d, bytesPerPage=%d", tag->pagesCount, tag->bytesPerPage);
reply_ng(CMD_HF_ISO15693_SIMULATE, PM3_EOPABORTED, NULL, 0);
return;
}
Iso15693InitTag(); // init simulator
Iso15693InitTag();
LED_A_ON();
if (g_dbglevel >= DBG_DEBUG)
Dbprintf("ISO-15963 Simulating uid: %02X%02X%02X%02X%02X%02X%02X%02X, %u bytes/blocks x %u blocks", tag->uid[7], tag->uid[6], tag->uid[5], tag->uid[4], tag->uid[3], tag->uid[2], tag->uid[1], tag->uid[0], tag->bytesPerPage, tag->pagesCount);
if (g_dbglevel >= DBG_DEBUG) {
Dbprintf("ISO-15963 Simulating uid: %02X%02X%02X%02X%02X%02X%02X%02X, %u bytes/blocks x %u blocks"
, tag->uid[7]
, tag->uid[6]
, tag->uid[5]
, tag->uid[4]
, tag->uid[3]
, tag->uid[2]
, tag->uid[1]
, tag->uid[0]
, tag->bytesPerPage
, tag->pagesCount
);
}
LED_C_ON();
@ -2578,8 +2594,9 @@ void SimTagIso15693(uint8_t *uid, uint8_t block_size) {
switch_off();
if (button_pressed)
if (button_pressed) {
DbpString("button pressed");
}
reply_ng(CMD_HF_ISO15693_SIMULATE, PM3_SUCCESS, NULL, 0);
}

17
client/src/cmdhf15.c
View file

@ -1432,8 +1432,7 @@ static int CmdHF15Sim(const char *Cmd) {
PacketResponseNG resp;
// get UID from emulator, for printing??
// iceman: downloading 2200 bytes just to get a 8 byte UID is overkill
// get UID from emulator for printing
if (uidlen == 0) {
struct {
@ -1455,7 +1454,7 @@ static int CmdHF15Sim(const char *Cmd) {
PrintAndLogEx(WARNING, "Failed to get UID from emulator memory");
return resp.status;
}
PrintAndLogEx(SUCCESS, "Starting simulating UID " _YELLOW_("%s"), iso15693_sprintUID(NULL, resp.data.asBytes));
PrintAndLogEx(SUCCESS, "Start simulating UID... " _YELLOW_("%s"), iso15693_sprintUID(NULL, resp.data.asBytes));
}
PrintAndLogEx(INFO, "Press " _YELLOW_("`pm3-button`") " to abort simulation");
@ -1850,10 +1849,14 @@ static int CmdHF15Dump(const char *Cmd) {
memcpy(tag->uid, &d[2], 8);
if (d[1] & 0x01)
if (d[1] & 0x01) {
tag->dsfid = d[dCpt++];
if (d[1] & 0x02)
}
if (d[1] & 0x02) {
tag->afi = d[dCpt++];
}
if (d[1] & 0x04) {
tag->pagesCount = d[dCpt++] + 1;
tag->bytesPerPage = d[dCpt++] + 1;
@ -1862,8 +1865,10 @@ static int CmdHF15Dump(const char *Cmd) {
tag->bytesPerPage = blocksize;
tag->pagesCount = 128;
}
if (d[1] & 0x08)
if (d[1] & 0x08) {
tag->ic = d[dCpt++];
}
if (verbose) {
print_emltag_info_15693(tag);