github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 13:23:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

iso15sim: enhance parameter controls and add reply when error

Browse source
This commit is contained in:
Yann GASCUEL 2024-01-24 13:47:59 +01:00
commit aabbf7d4b2
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
armsrc/iso15693.c
View file

@ -2133,8 +2133,6 @@ void SimTagIso15693(uint8_t *uid, uint8_t block_size) {
BigBuf_free_keep_EM(); BigBuf_free_keep_EM();
iso15_tag_t *tag = (iso15_tag_t*) BigBuf_get_EM_addr(); iso15_tag_t *tag = (iso15_tag_t*) BigBuf_get_EM_addr();
if (tag == NULL) return;
if (uid != NULL) { // new tag (need initialization) if (uid != NULL) { // new tag (need initialization)
memcpy(tag->uid, uid, 8); memcpy(tag->uid, uid, 8);
tag->dsfid = 0; tag->dsfid = 0;
@ -2146,14 +2144,21 @@ void SimTagIso15693(uint8_t *uid, uint8_t block_size) {
tag->ic = 0; tag->ic = 0;
memset(tag->locks, 0, sizeof(tag->locks)); memset(tag->locks, 0, sizeof(tag->locks));
memset(tag->data, 0, sizeof(tag->data)); memset(tag->data, 0, sizeof(tag->data));
} if (tag == NULL)
else { // tag is already set {
if (tag->pagesCount > ISO15693_TAG_MAX_PAGES || \ Dbprintf("Can't allocate emulator memory");
tag->pagesCount * tag->bytesPerPage > ISO15693_TAG_MAX_SIZE) { reply_ng(CMD_HF_ISO15693_SIMULATE, PM3_EFAILED, NULL, 0);
Dbprintf("Tag size error: pagesCount = %d, bytesPerPage=%d", tag->pagesCount, tag->bytesPerPage);
return; return;
} }
} }
}
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(); // init simulator