Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions boot/boot_serial/src/boot_serial_encryption.c
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ decrypt_region_inplace(struct boot_loader_state *state,
blk_sz = tlv_off - (off + bytes_copied);
}
}
assert(idx < sz);
boot_enc_decrypt(BOOT_CURR_ENC(state), slot,
(off + bytes_copied + idx) - hdr->ih_hdr_size, blk_sz,
blk_off, &buf[idx]);
Expand Down
4 changes: 3 additions & 1 deletion boot/bootutil/include/bootutil/fault_injection_hardening.h
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,9 @@ int fih_delay(void)

delay = fih_delay_random_uchar();

for (volatile int i = 0; i < delay; i++) {
for (volatile int i = 0; i < delay;) {
int tmp = i;
i = tmp + 1;
foo++;
}

Expand Down
2 changes: 1 addition & 1 deletion boot/zcbor/src/zcbor_decode.c
Original file line number Diff line number Diff line change
Expand Up @@ -926,7 +926,7 @@ bool zcbor_unordered_map_search(zcbor_decoder_t key_decoder, zcbor_state_t *stat
}

/* Skip over both the key and the value. */
if (!zcbor_any_skip(state, NULL) || !zcbor_any_skip(state, NULL)) {
if (!zcbor_any_skip(state, NULL)) {
goto error;
}
} while (state->elem_count != elem_count);
Expand Down
4 changes: 3 additions & 1 deletion scripts/imgtool/boot_record.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ def create_sw_component_data(sw_type, sw_version, sw_measurement_description,

# Note: The measurement value must be the last item of the property
# list because later it will be modified by the bootloader.
last_key = list(properties.keys())[-1]
keys = list(properties.keys())
assert len(keys) > 0
last_key = keys[-1]
assert SwComponent.MEASUREMENT_VALUE == last_key, 'Measurement value is not the last item of the property list'
return dumps(properties)
Loading