github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-14 02:27:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

em4x70 --par deprecation: Step 4: remove client references to client->arm field that used to store this

Browse source
This commit is contained in:
Henry Gabryjelski 2025-06-09 14:03:05 -07:00
commit 69a2cc1ff0
2 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
client/src/cmdlfem4x70.c
View file

@ -221,7 +221,7 @@ static int get_em4x70_info(em4x70_tag_info_t *data_out) {
memset(data_out, 0, sizeof(em4x70_tag_info_t)); memset(data_out, 0, sizeof(em4x70_tag_info_t));
// TODO: change firmware to use per-cmd structures // TODO: change firmware to use per-cmd structures
em4x70_data_t edata = { .deprecated_ignored_use_parity = false }; em4x70_data_t edata = {0};
clearCommandBuffer(); clearCommandBuffer();
SendCommandNG(CMD_LF_EM4X70_INFO, (uint8_t *)&edata, sizeof(em4x70_data_t)); SendCommandNG(CMD_LF_EM4X70_INFO, (uint8_t *)&edata, sizeof(em4x70_data_t));
PacketResponseNG resp; PacketResponseNG resp;
@ -239,10 +239,10 @@ static int writeblock_em4x70(const em4x70_cmd_input_writeblock_t *opts, em4x70_t
memset(data_out, 0, sizeof(em4x70_tag_info_t)); memset(data_out, 0, sizeof(em4x70_tag_info_t));
// TODO: change firmware to use per-cmd structures // TODO: change firmware to use per-cmd structures
em4x70_data_t etd = {0}; em4x70_data_t etd = {
etd.address = opts->block; .address = opts->block,
etd.word = BYTES2UINT16(opts->value); .word = BYTES2UINT16(opts->value),
etd.deprecated_ignored_use_parity = false; };
clearCommandBuffer(); clearCommandBuffer();
SendCommandNG(CMD_LF_EM4X70_WRITE, (uint8_t *)&etd, sizeof(etd)); SendCommandNG(CMD_LF_EM4X70_WRITE, (uint8_t *)&etd, sizeof(etd));
@ -261,7 +261,6 @@ static int auth_em4x70(const em4x70_cmd_input_auth_t *opts, em4x70_cmd_output_au
// TODO: change firmware to use per-cmd structures // TODO: change firmware to use per-cmd structures
em4x70_data_t etd = {0}; em4x70_data_t etd = {0};
etd.deprecated_ignored_use_parity = false;
memcpy(&etd.rnd[0], &opts->rn.rn[0], 7); memcpy(&etd.rnd[0], &opts->rn.rn[0], 7);
memcpy(&etd.frnd[0], &opts->frn.frn[0], 4); memcpy(&etd.frnd[0], &opts->frn.frn[0], 4);
@ -286,7 +285,6 @@ static int setkey_em4x70(const em4x70_cmd_input_setkey_t *opts) {
// TODO: change firmware to use per-cmd structures // TODO: change firmware to use per-cmd structures
em4x70_data_t etd = {0}; em4x70_data_t etd = {0};
etd.deprecated_ignored_use_parity = false;
memcpy(&etd.crypt_key[0], &opts->key.k[0], 12); memcpy(&etd.crypt_key[0], &opts->key.k[0], 12);
clearCommandBuffer(); clearCommandBuffer();
@ -303,7 +301,6 @@ static int brute_em4x70(const em4x70_cmd_input_brute_t *opts, em4x70_cmd_output_
// TODO: change firmware to use per-cmd structures // TODO: change firmware to use per-cmd structures
em4x70_data_t etd = {0}; em4x70_data_t etd = {0};
etd.deprecated_ignored_use_parity = false;
etd.address = opts->block; etd.address = opts->block;
memcpy(&etd.rnd[0], &opts->rn.rn[0], 7); memcpy(&etd.rnd[0], &opts->rn.rn[0], 7);
memcpy(&etd.frnd[0], &opts->frn.frn[0], 4); memcpy(&etd.frnd[0], &opts->frn.frn[0], 4);
@ -354,7 +351,6 @@ static int unlock_em4x70(const em4x70_cmd_input_unlock_t *opts, em4x70_tag_info_
// TODO: change firmware to use per-cmd structures // TODO: change firmware to use per-cmd structures
em4x70_data_t etd = {0}; em4x70_data_t etd = {0};
etd.deprecated_ignored_use_parity = false;
etd.pin = BYTES2UINT32(opts->pin); etd.pin = BYTES2UINT32(opts->pin);
clearCommandBuffer(); clearCommandBuffer();
@ -374,7 +370,6 @@ static int setpin_em4x70(const em4x70_cmd_input_setpin_t *opts, em4x70_tag_info_
// TODO: change firmware to use per-cmd structures // TODO: change firmware to use per-cmd structures
em4x70_data_t etd = {0}; em4x70_data_t etd = {0};
etd.deprecated_ignored_use_parity = false;
etd.pin = BYTES2UINT32(opts->pin); etd.pin = BYTES2UINT32(opts->pin);
clearCommandBuffer(); clearCommandBuffer();

2
include/em4x70.h
View file

@ -38,7 +38,7 @@
/// The only requirement is that this structure remain /// The only requirement is that this structure remain
/// smaller than the NG buffer size (256 bytes). /// smaller than the NG buffer size (256 bytes).
typedef struct { typedef struct {
bool deprecated_ignored_use_parity; // BUGBUG: Deprecated, ignored, but kept for structure size compatibility bool _ignored__was_use_parity; // BUGBUG: Ignored, but kept for structure size / offset compatibility
// Used for writing address // Used for writing address
uint8_t address; uint8_t address;