Merge: Synchronized up to https://github.com/zephyrproject-rtos/mcuboot/commit/360763 (3fc59410) · Commits · Wenxi XU / Mcuboot

boot/bootutil/include/bootutil/bootutil_public.h

+30 −0

Original line number	Diff line number	Diff line
		@@ -88,6 +88,36 @@ extern "C" {

		#define BOOT_MAGIC_SZ (sizeof boot_img_magic)

		#define BOOT_EFLASH 1
		#define BOOT_EFILE 2
		#define BOOT_EBADIMAGE 3
		#define BOOT_EBADVECT 4
		#define BOOT_EBADSTATUS 5
		#define BOOT_ENOMEM 6
		#define BOOT_EBADARGS 7
		#define BOOT_EBADVERSION 8

		/*
		* Extract the swap type and image number from image trailers's swap_info
		* filed.
		*/
		#define BOOT_GET_SWAP_TYPE(swap_info) ((swap_info) & 0x0F)
		#define BOOT_GET_IMAGE_NUM(swap_info) ((swap_info) >> 4)

		/* Construct the swap_info field from swap type and image number */
		#define BOOT_SET_SWAP_INFO(swap_info, image, type) { \
		assert((image) < 0xF); \
		assert((type) < 0xF); \
		(swap_info) = (image) << 4 \
		\| (type); \
		}
		#ifdef MCUBOOT_HAVE_ASSERT_H
		#include "mcuboot_config/mcuboot_assert.h"
		#else
		#include <assert.h>
		#define ASSERT assert
		#endif

		struct boot_swap_state {
		uint8_t magic; /* One of the BOOT_MAGIC_[...] values. */
		uint8_t swap_type; /* One of the BOOT_SWAP_TYPE_[...] values. */

boot/bootutil/include/bootutil/enc_key.h

+1 −16

Original line number	Diff line number	Diff line
		@@ -32,29 +32,14 @@
		#include <flash_map_backend/flash_map_backend.h>
		#include "bootutil/crypto/aes_ctr.h"
		#include "bootutil/image.h"
		#include "bootutil/enc_key_public.h"

		#ifdef __cplusplus
		extern "C" {
		#endif

		#define BOOT_ENC_KEY_SIZE 16
		#define BOOT_ENC_KEY_SIZE_BITS (BOOT_ENC_KEY_SIZE * 8)

		#define TLV_ENC_RSA_SZ 256
		#define TLV_ENC_KW_SZ 24
		#define TLV_ENC_EC256_SZ (65 + 32 + 16)
		#define TLV_ENC_X25519_SZ (32 + 32 + 16)

		#if defined(MCUBOOT_ENCRYPT_RSA)
		#define BOOT_ENC_TLV_SIZE TLV_ENC_RSA_SZ
		#elif defined(MCUBOOT_ENCRYPT_EC256)
		#define BOOT_ENC_TLV_SIZE TLV_ENC_EC256_SZ
		#elif defined(MCUBOOT_ENCRYPT_X25519)
		#define BOOT_ENC_TLV_SIZE TLV_ENC_X25519_SZ
		#else
		#define BOOT_ENC_TLV_SIZE TLV_ENC_KW_SZ
		#endif

		#define BOOT_ENC_TLV_ALIGN_SIZE \
		((((BOOT_ENC_TLV_SIZE - 1) / BOOT_MAX_ALIGN) + 1) * BOOT_MAX_ALIGN)

boot/bootutil/include/bootutil/enc_key_public.h

0 → 100644

+56 −0

Original line number	Diff line number	Diff line
		/*
		* SPDX-License-Identifier: Apache-2.0
		*
		* Copyright (c) 2018-2019 JUUL Labs
		* Copyright (c) 2019 Arm Limited
		* Copyright (c) 2021 Nordic Semiconductor ASA
		*
		* Original license:
		*
		* Licensed to the Apache Software Foundation (ASF) under one
		* or more contributor license agreements. See the NOTICE file
		* distributed with this work for additional information
		* regarding copyright ownership. The ASF licenses this file
		* to you under the Apache License, Version 2.0 (the
		* "License"); you may not use this file except in compliance
		* with the License. You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing,
		* software distributed under the License is distributed on an
		* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
		* KIND, either express or implied. See the License for the
		* specific language governing permissions and limitations
		* under the License.
		*/

		#ifndef BOOTUTIL_ENC_KEY_PUBLIC_H
		#define BOOTUTIL_ENC_KEY_PUBLIC_H
		#include <mcuboot_config/mcuboot_config.h>
		#ifdef __cplusplus
		extern "C" {
		#endif

		#define BOOT_ENC_KEY_SIZE 16

		#define TLV_ENC_RSA_SZ 256
		#define TLV_ENC_KW_SZ 24
		#define TLV_ENC_EC256_SZ (65 + 32 + 16)
		#define TLV_ENC_X25519_SZ (32 + 32 + 16)

		#if defined(MCUBOOT_ENCRYPT_RSA)
		#define BOOT_ENC_TLV_SIZE TLV_ENC_RSA_SZ
		#elif defined(MCUBOOT_ENCRYPT_EC256)
		#define BOOT_ENC_TLV_SIZE TLV_ENC_EC256_SZ
		#elif defined(MCUBOOT_ENCRYPT_X25519)
		#define BOOT_ENC_TLV_SIZE TLV_ENC_X25519_SZ
		#else
		#define BOOT_ENC_TLV_SIZE TLV_ENC_KW_SZ
		#endif

		#ifdef __cplusplus
		}
		#endif

		#endif /* BOOTUTIL_ENC_KEY_PUBLIC_H */
		No newline at end of file

boot/bootutil/src/bootutil_priv.h

+0 −31

Original line number	Diff line number	Diff line
		@@ -47,24 +47,8 @@
		extern "C" {
		#endif

		#ifdef MCUBOOT_HAVE_ASSERT_H
		#include "mcuboot_config/mcuboot_assert.h"
		#else
		#include <assert.h>
		#define ASSERT assert
		#endif

		struct flash_area;

		#define BOOT_EFLASH 1
		#define BOOT_EFILE 2
		#define BOOT_EBADIMAGE 3
		#define BOOT_EBADVECT 4
		#define BOOT_EBADSTATUS 5
		#define BOOT_ENOMEM 6
		#define BOOT_EBADARGS 7
		#define BOOT_EBADVERSION 8

		#define BOOT_TMPBUF_SZ 256

		/** Number of image slots in flash; currently limited to two. */
		@@ -169,21 +153,6 @@ _Static_assert(BOOT_IMAGE_NUMBER > 0, "Invalid value for BOOT_IMAGE_NUMBER");

		#define BOOT_MAX_IMG_SECTORS MCUBOOT_MAX_IMG_SECTORS

		/*
		* Extract the swap type and image number from image trailers's swap_info
		* filed.
		*/
		#define BOOT_GET_SWAP_TYPE(swap_info) ((swap_info) & 0x0F)
		#define BOOT_GET_IMAGE_NUM(swap_info) ((swap_info) >> 4)

		/* Construct the swap_info field from swap type and image number */
		#define BOOT_SET_SWAP_INFO(swap_info, image, type) { \
		assert((image) < 0xF); \
		assert((type) < 0xF); \
		(swap_info) = (image) << 4 \
		\| (type); \
		}

		#define BOOT_LOG_IMAGE_INFO(slot, hdr) \
		BOOT_LOG_INF("%-9s slot: version=%u.%u.%u+%u", \
		((slot) == BOOT_PRIMARY_SLOT) ? "Primary" : "Secondary", \

boot/bootutil/src/bootutil_public.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -45,10 +45,9 @@

		#include "bootutil/image.h"
		#include "bootutil/bootutil_public.h"
		#include "bootutil_priv.h"
		#include "bootutil/bootutil_log.h"
		#ifdef MCUBOOT_ENC_IMAGES
		#include "bootutil/enc_key.h"
		#include "bootutil/enc_key_public.h"
		#endif

		#ifdef CONFIG_MCUBOOT

Admin message