boot: Reduce repeating code in boot_decrypt_and_copy_image_to_sram
There was not really needed repetition of code in if-else
block; common code has been moved out and the block has been
reduced.
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
diff --git a/boot/bootutil/src/loader.c b/boot/bootutil/src/loader.c
index 9413714..ba41cdc 100644
--- a/boot/bootutil/src/loader.c
+++ b/boot/bootutil/src/loader.c
@@ -2769,21 +2769,15 @@
cur_dst = ram_dst + bytes_copied;
blk_sz = chunk_sz;
idx = 0;
+ blk_off = ((bytes_copied) - hdr->ih_hdr_size) & 0xf;
if (bytes_copied + chunk_sz > tlv_off) {
/* Going over TLV section
* Part of the chunk is encrypted payload */
- blk_off = ((bytes_copied) - hdr->ih_hdr_size) & 0xf;
blk_sz = tlv_off - (bytes_copied);
- boot_encrypt(BOOT_CURR_ENC(state), image_index, area_id,
- (bytes_copied + idx) - hdr->ih_hdr_size, blk_sz,
- blk_off, cur_dst);
- } else {
- /* Image encrypted payload section */
- blk_off = ((bytes_copied) - hdr->ih_hdr_size) & 0xf;
- boot_encrypt(BOOT_CURR_ENC(state), image_index, area_id,
- (bytes_copied + idx) - hdr->ih_hdr_size, blk_sz,
- blk_off, cur_dst);
}
+ boot_encrypt(BOOT_CURR_ENC(state), image_index, area_id,
+ (bytes_copied + idx) - hdr->ih_hdr_size, blk_sz,
+ blk_off, cur_dst);
bytes_copied += chunk_sz;
}