Unverified Commit 3ad36f82 authored by Andrzej Puzdrowski's avatar Andrzej Puzdrowski Committed by GitHub
Browse files

Merge: synchronized up to https://github.com/mcu-tools/mcuboot/commit/22b856b 

Synch up to:
https://github.com/mcu-tools/mcuboot/commit/22b856beeae740c57116e54daf09f166e130acd7



- bootutil_public: allow to confirm padded image without copy-done flag
- boot: zephyr: Configure mimxrt106x_evk boards

Merged by GH GUI

Signed-off-by: default avatarAndrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
parents 6eca8bbc 22b856be

.github/workflows/sim.yaml

+1 −4
Original line number Diff line number Diff line
@@ -26,10 +26,7 @@ jobs: 
        - "sig-ecdsa-mbedtls enc-kw validate-primary-slot"

        - "sig-rsa validate-primary-slot overwrite-only large-write"

        - "sig-ecdsa enc-ec256 validate-primary-slot"

        # ecdsa-mbedtls and enc-ec256 are not currently supported

        # together, as the ec256 code requires only one backend be

        # active.

        # - "sig-ecdsa-mbedtls enc-ec256 validate-primary-slot"

        - "sig-ecdsa-mbedtls enc-ec256-mbedtls validate-primary-slot"

        - "sig-rsa validate-primary-slot overwrite-only downgrade-prevention"

    runs-on: ubuntu-latest

    env:

boot/bootutil/include/bootutil/crypto/ecdh_p256.h

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ static inline int bootutil_ecdh_p256_shared_secret(bootutil_ecdh_p256_context *c 
#endif /* MCUBOOT_USE_TINYCRYPT */



#if defined(MCUBOOT_USE_MBED_TLS)

#define NUM_ECC_BYTES 32



typedef struct bootutil_ecdh_p256_context {

    mbedtls_ecp_group grp;

    mbedtls_ecp_point P;

boot/bootutil/src/bootutil_public.c

+4 −5
Original line number Diff line number Diff line
@@ -583,11 +583,10 @@ boot_set_confirmed(void) 
        goto done;

    }



    if (state_primary_slot.copy_done == BOOT_FLAG_UNSET) {

        /* Swap never completed.  This is unexpected. */

        rc = BOOT_EBADVECT;

        goto done;

    }

    /* Intentionally do not check copy_done flag

     * so can confirm a padded image which was programed using a programing

     * interface.

     */



    if (state_primary_slot.image_ok != BOOT_FLAG_UNSET) {

        /* Already confirmed. */

boot/zephyr/boards/mimxrt1060_evk.conf

0 → 100644
+4 −0
Original line number Diff line number Diff line 
# Copyright 2021 NXP

# SPDX-License-Identifier: Apache-2.0



CONFIG_BOOT_MAX_IMG_SECTORS=1024

boot/zephyr/boards/mimxrt1064_evk.conf

0 → 100644
+4 −0
Original line number Diff line number Diff line 
# Copyright 2021 NXP

# SPDX-License-Identifier: Apache-2.0



CONFIG_BOOT_MAX_IMG_SECTORS=512

CRA Git | Maintained and supported by SUSTech CRA and CCSE