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

native tx chaining

Browse source
This commit is contained in:
merlokk 2021-07-28 22:31:17 +03:00
commit 6459e5cc39
2 changed files with 34 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

30
client/src/mifare/desfirecore.c
View file

@ -381,19 +381,45 @@ static int DesfireExchangeNative(bool activate_field, DesfireContext *ctx, uint8
uint32_t i = 1; uint32_t i = 1;
uint8_t rcode = 0xff; uint8_t rcode = 0xff;
uint8_t cdata[255] = {0}; uint8_t cdata[1024] = {0};
uint32_t cdatalen = 0; uint32_t cdatalen = 0;
cdata[0] = cmd; cdata[0] = cmd;
memcpy(&cdata[1], data, datalen); memcpy(&cdata[1], data, datalen);
cdatalen = datalen + 1; cdatalen = datalen + 1;
int res = DESFIRESendRaw(activate_field, cdata, cdatalen, buf, sizeof(buf), &buflen, &rcode); int res = 0;
size_t len = 0;
// tx chaining
size_t sentdatalen = 0;
while(cdatalen >= sentdatalen) {
if (cdatalen - sentdatalen > DESFIRE_TX_FRAME_MAX_LEN)
len = DESFIRE_TX_FRAME_MAX_LEN;
else
len = cdatalen - sentdatalen;
size_t sendindx = sentdatalen;
size_t sendlen = len;
if (sentdatalen > 0) {
sendindx--;
sendlen++;
cdata[sendindx] = MFDES_ADDITIONAL_FRAME;
}
res = DESFIRESendRaw(activate_field, &cdata[sendindx], sendlen, buf, sizeof(buf), &buflen, &rcode);
if (res != PM3_SUCCESS) { if (res != PM3_SUCCESS) {
uint16_t ssw = DESFIRE_GET_ISO_STATUS(rcode); uint16_t ssw = DESFIRE_GET_ISO_STATUS(rcode);
PrintAndLogEx(DEBUG, "error DESFIRESendRaw %s", DesfireGetErrorString(res, &ssw)); PrintAndLogEx(DEBUG, "error DESFIRESendRaw %s", DesfireGetErrorString(res, &ssw));
return res; return res;
} }
sentdatalen += len;
if (rcode != MFDES_ADDITIONAL_FRAME || buflen > 0) {
if (sentdatalen != cdatalen)
PrintAndLogEx(WARNING, "Tx chaining error. Needs to send: %d but sent: %d", cdatalen, sentdatalen);
break;
}
}
// rx
if (resp) { if (resp) {
if (splitbysize) { if (splitbysize) {
resp[0] = buflen; resp[0] = buflen;

2
client/src/mifare/desfirecore.h
View file

@ -19,6 +19,8 @@
#include "mifare/desfire_crypto.h" #include "mifare/desfire_crypto.h"
#include "mifare/mifare4.h" #include "mifare/mifare4.h"
#define DESFIRE_TX_FRAME_MAX_LEN 54
typedef struct { typedef struct {
const uint8_t id; const uint8_t id;
const char *text; const char *text;