Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-01 04:29:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to READ_MULTI and GET_BLOCK_SECURITY commands in 15693-3 emu [ci skip]

Browse Source 
by WillyJL & aaronjamt
This commit is contained in:
MX
2026-01-26 03:04:46 +03:00
parent c5ea6f7982
commit 896a500667
4 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/nfc/protocols/iso15693_3/iso15693_3_listener.c
View File

@@ -8,8 +8,6 @@
#define TAG "Iso15693_3Listener"
#define ISO15693_3_LISTENER_BUFFER_SIZE (256U)
Iso15693_3Listener* iso15693_3_listener_alloc(Nfc* nfc, Iso15693_3Data* data) {
furi_assert(nfc);

20
lib/nfc/protocols/iso15693_3/iso15693_3_listener_i.c
View File

@@ -263,8 +263,9 @@ static Iso15693_3Error iso15693_3_listener_read_multi_blocks_handler(
const uint32_t block_index_start = request->first_block_num;
const uint32_t block_index_end =
MIN((block_index_start + request->block_count + 1),
MIN((block_index_start + request->block_count),
((uint32_t)instance->data->system_info.block_count - 1));
const uint32_t block_count = block_index_end - block_index_start + 1;
error = iso15693_3_listener_extension_handler(
instance,
@@ -273,8 +274,21 @@ static Iso15693_3Error iso15693_3_listener_read_multi_blocks_handler(
(uint32_t)block_index_end);
if(error != Iso15693_3ErrorNone) break;
const bool include_block_security = (flags & ISO15693_3_REQ_FLAG_T4_OPTION) != 0;
const uint8_t bytes_per_block =
(include_block_security ? 1 : 0) + instance->data->system_info.block_size;
const uint32_t response_data_max =
bit_buffer_get_capacity_bytes(instance->tx_buffer) - 1 - 2; // Flags and CRC
const uint32_t response_blocks_max = response_data_max / bytes_per_block;
if(block_count > response_blocks_max) {
// Tested on SLIX2, if asked for more blocks than supported at once there is no reply
// Let's do the same
error = Iso15693_3ErrorIgnore;
break;
}
for(uint32_t i = block_index_start; i <= block_index_end; ++i) {
if(flags & ISO15693_3_REQ_FLAG_T4_OPTION) {
if(include_block_security) {
iso15693_3_append_block_security(
instance->data, i, instance->tx_buffer); // Block security (optional)
}
@@ -341,7 +355,7 @@ static Iso15693_3Error iso15693_3_listener_write_multi_blocks_handler(
if(error != Iso15693_3ErrorNone) break;
for(uint32_t i = block_index_start; i < block_count + request->first_block_num; ++i) {
for(uint32_t i = block_index_start; i <= block_index_end; ++i) {
const uint8_t* block_data = &request->block_data[block_size * i];
iso15693_3_set_block_data(instance->data, i, block_data, block_size);
}

12
lib/nfc/protocols/iso15693_3/iso15693_3_listener_i.h
View File

@@ -10,6 +10,18 @@
extern "C" {
#endif
// Based on GET_BLOCKS_SECURITY, one of the commands with lengthier responses:
// - 1 byte flags
// - 1 byte security status * 256 max block count
// - 2 byte crc
// for a response size of 259 bytes.
// There is also READ_MULTI_BLOCKS which has no explicit limit on requested block count
// and ISO 15693-3 also does not specify a maximum overall response length, so this command could
// theoretically result in a 8195 byte response (1 byte flags + 32 byte block * 256 blocks + 2 byte crc);
// for practicality we use a sufficient buffer for a full GET_BLOCKS_SECURITY and
// limit READ_MULTI_BLOCKS to how many blocks we can fit into that buffer size.
#define ISO15693_3_LISTENER_BUFFER_SIZE (259U)
typedef enum {
Iso15693_3ListenerStateReady,
Iso15693_3ListenerStateSelected,