RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-27 09:37:15 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix #1748 - failed to take in consideration size of legic struct packet when uploading data to device

Browse source
This commit is contained in:
iceman1001 2022-08-05 15:34:16 +02:00
parent 6001ff6edf
commit 5a4b8c8224
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
client/src/cmdhflegic.c
View file

@ -34,6 +34,7 @@ static int CmdHelp(const char *Cmd);
#define LEGIC_PRIME_MIM256 256 #define LEGIC_PRIME_MIM256 256
#define LEGIC_PRIME_MIM1024 1024 #define LEGIC_PRIME_MIM1024 1024
#define LEGIC_BLOCK_SIZE 8 #define LEGIC_BLOCK_SIZE 8
#define LEGIC_PACKET_SIZE (PM3_CMD_DATA_SIZE - sizeof(legic_packet_t))
static bool legic_xor(uint8_t *data, uint16_t cardsize) { static bool legic_xor(uint8_t *data, uint16_t cardsize) {
@ -737,9 +738,9 @@ void legic_seteml(uint8_t *src, uint32_t offset, uint32_t numofbytes) {
// fast push mode // fast push mode
g_conn.block_after_ACK = true; g_conn.block_after_ACK = true;
for (size_t i = offset; i < numofbytes; i += (PM3_CMD_DATA_SIZE - sizeof(legic_packet_t))) { for (size_t i = offset; i < numofbytes; i += LEGIC_PACKET_SIZE) {
size_t len = MIN((numofbytes - i), (PM3_CMD_DATA_SIZE - sizeof(legic_packet_t))); size_t len = MIN((numofbytes - i), LEGIC_PACKET_SIZE);
if (len == numofbytes - i) { if (len == numofbytes - i) {
// Disable fast mode on last packet // Disable fast mode on last packet
g_conn.block_after_ACK = false; g_conn.block_after_ACK = false;
@ -943,9 +944,9 @@ static int CmdLegicRestore(const char *Cmd) {
// transfer to device // transfer to device
PacketResponseNG resp; PacketResponseNG resp;
// 7 = skip UID bytes and MCC // 7 = skip UID bytes and MCC
for (size_t i = 7; i < bytes_read; i += PM3_CMD_DATA_SIZE) { for (size_t i = 7; i < bytes_read; i += LEGIC_PACKET_SIZE) {
size_t len = MIN((bytes_read - i), PM3_CMD_DATA_SIZE); size_t len = MIN((bytes_read - i), LEGIC_PACKET_SIZE);
if (len == bytes_read - i) { if (len == bytes_read - i) {
// Disable fast mode on last packet // Disable fast mode on last packet
g_conn.block_after_ACK = false; g_conn.block_after_ACK = false;
@ -1209,11 +1210,11 @@ static int CmdLegicWipe(const char *Cmd) {
// transfer to device // transfer to device
PacketResponseNG resp; PacketResponseNG resp;
for (size_t i = 7; i < card.cardsize; i += PM3_CMD_DATA_SIZE) { for (size_t i = 7; i < card.cardsize; i += LEGIC_PACKET_SIZE) {
PrintAndLogEx(NORMAL, "." NOLF); PrintAndLogEx(NORMAL, "." NOLF);
size_t len = MIN((card.cardsize - i), PM3_CMD_DATA_SIZE); size_t len = MIN((card.cardsize - i), LEGIC_PACKET_SIZE);
if (len == card.cardsize - i) { if (len == card.cardsize - i) {
// Disable fast mode on last packet // Disable fast mode on last packet
g_conn.block_after_ACK = false; g_conn.block_after_ACK = false;