Merge: Synchronized up to JuulLabs-OSS@c74c551 (c71d2186) · Commits · Wenxi XU / Mcuboot

boot/boot_serial/src/boot_serial.c

+38 −6

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@
		#include <os/os_malloc.h>

		#include <bootutil/image.h>
		#include <bootutil/bootutil.h>

		#include "boot_serial/boot_serial.h"
		#include "boot_serial_priv.h"
		@@ -312,11 +313,17 @@ bs_upload(char *buf, int len)
		rc = 0;
		goto out;
		}
		if (curr_off + img_blen < img_size) {

		if (curr_off + img_blen > img_size) {
		rc = MGMT_ERR_EINVAL;
		goto out;
		}

		rem_bytes = img_blen % flash_area_align(fap);
		if (rem_bytes) {

		if ((curr_off + img_blen < img_size) && rem_bytes) {
		img_blen -= rem_bytes;
		}
		rem_bytes = 0;
		}

		#ifdef CONFIG_BOOT_ERASE_PROGRESSIVELY
		@@ -337,7 +344,32 @@ bs_upload(char *buf, int len)
		#endif

		BOOT_LOG_INF("Writing at 0x%x until 0x%x", curr_off, curr_off + img_blen);
		if (rem_bytes) {
		/* the last chunk of the image might be unaligned */
		uint8_t wbs_aligned[BOOT_MAX_ALIGN];
		size_t w_size = img_blen - rem_bytes;

		if (w_size) {
		rc = flash_area_write(fap, curr_off, img_data, w_size);
		if (rc) {
		goto out_invalid_data;
		}
		curr_off += w_size;
		img_blen -= w_size;
		img_data += w_size;
		}

		if (img_blen) {
		memcpy(wbs_aligned, img_data, rem_bytes);
		memset(wbs_aligned + rem_bytes, flash_area_erased_val(fap),
		sizeof(wbs_aligned) - rem_bytes);
		rc = flash_area_write(fap, curr_off, wbs_aligned, flash_area_align(fap));
		}

		} else {
		rc = flash_area_write(fap, curr_off, img_data, img_blen);
		}

		if (rc == 0) {
		curr_off += img_blen;
		#ifdef CONFIG_BOOT_ERASE_PROGRESSIVELY

+1 −1

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ static inline void bootutil_ecdsa_p256_drop(bootutil_ecdsa_p256_context *ctx)
		(void)ctx;
		}

		static inline int bootutil_ecdsa_p256_verify(bootutil_ecdsa_p256_context ctx, const uint8_t pk, const uint8_t hash, const uint8_t sig)
		static inline int bootutil_ecdsa_p256_verify(bootutil_ecdsa_p256_context ctx, uint8_t pk, uint8_t hash, uint8_t sig)
		{
		(void)ctx;
		return cc310_ecdsa_verify_secp256r1(hash, pk, sig, BOOTUTIL_CRYPTO_ECDSA_P256_HASH_SIZE);

+22 −0

Original line number	Diff line number	Diff line
		@@ -284,7 +284,11 @@ void fih_cfi_decrement(void);
		/* Label for interacting with FIH testing tool. Can be parsed from the elf file
		* after compilation. Does not require debug symbols.
		*/
		#if defined(__ICCARM__)
		#define FIH_LABEL(str, lin, cnt) __asm volatile ("FIH_LABEL_" str "_" #lin "_" #cnt "::" ::);
		#else
		#define FIH_LABEL(str) __asm volatile ("FIH_LABEL_" str "_%=:" ::);
		#endif

		/* Main FIH calling macro. return variable is second argument. Does some setup
		* before and validation afterwards. Inserts labels for use with testing script.
		@@ -301,6 +305,23 @@ void fih_cfi_decrement(void);
		* previously saved value. If this is equal then the function call and all child
		* function calls were performed.
		*/
		#if defined(__ICCARM__)
		#define FIH_CALL(f, ret, ...) FIH_CALL2(f, ret, __LINE__, __COUNTER__, __VA_ARGS__)

		#define FIH_CALL2(f, ret, l, c, ...) \
		do { \
		FIH_LABEL("FIH_CALL_START", l, c); \
		FIH_CFI_PRECALL_BLOCK; \
		ret = FIH_FAILURE; \
		if (fih_delay()) { \
		ret = f(__VA_ARGS__); \
		} \
		FIH_CFI_POSTCALL_BLOCK; \
		FIH_LABEL("FIH_CALL_END", l, c); \
		} while (0)

		#else

		#define FIH_CALL(f, ret, ...) \
		do { \
		FIH_LABEL("FIH_CALL_START"); \
		@@ -312,6 +333,7 @@ void fih_cfi_decrement(void);
		FIH_CFI_POSTCALL_BLOCK; \
		FIH_LABEL("FIH_CALL_END"); \
		} while (0)
		#endif

		/* FIH return changes the state of the internal state machine. If you do a
		* FIH_CALL then you need to do a FIH_RET else the state machine will detect

+3 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,9 @@

		#ifdef MCUBOOT_SIGN_EC256
		/TODO: remove this after cypress port mbedtls to abstract crypto api /
		#ifdef MCUBOOT_USE_CC310
		#define NUM_ECC_BYTES (256 / 8)
		#endif
		#if defined (MCUBOOT_USE_TINYCRYPT) \|\| defined (MCUBOOT_USE_CC310)
		#include "bootutil/sign_key.h"

+1 −1

Original line number	Diff line number	Diff line
		@@ -2207,7 +2207,7 @@ context_boot_go(struct boot_loader_state state, struct boot_rsp rsp)
		uint32_t img_sz;
		uint32_t img_loaded = 0;
		#endif /* MCUBOOT_RAM_LOAD */
		fih_int fih_rc;
		fih_int fih_rc = FIH_FAILURE;

		memset(state, 0, sizeof(struct boot_loader_state));