update to 2.1.0

.gitignore

@@ -19,3 +19,4 @@ localrepos.cmake
 **/__pycache__
 *.pyc
 
+.clang-format

.gitreview

@@ -2,3 +2,4 @@
 host=review.trustedfirmware.org
 port=29418
 project=TF-M/trusted-firmware-m
+defaultbranch=main

CMakeLists.txt

@@ -7,16 +7,7 @@
 #
 #-------------------------------------------------------------------------------
 
-cmake_minimum_required(VERSION 3.15)
-
-# CMake 3.21 and above requests projects to specify cpu/arch compile and link flags explicitly in
-# Armclang. Link: https://cmake.org/cmake/help/latest/policy/CMP0123.html
-# It is aligned with current Armclang toolchain implementation.
-# Explictly set this policy to NEW behavior to eliminate long warnings. It shall be set in root
-# CMakeLists.txt otherwise project() will throw out the warnings.
-if(POLICY CMP0123)
-    cmake_policy(SET CMP0123 NEW)
-endif()
+cmake_minimum_required(VERSION 3.21)
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 include(version)

bl1/Kconfig

@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Copyright (c) 2023, Arm Limited. All rights reserved.
+# Copyright (c) 2023-2024, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -84,6 +84,10 @@ config TFM_BL1_2_IN_OTP
     bool "Whether BL1_2 is stored in OTP"
     default y
 
+config TFM_BL1_2_IN_FLASH
+    bool "Whether BL1_2 is stored in FLASH"
+    default n
+
 config BL1_HEADER_SIZE
     hex "BL1 Header size"
     default 0x800

bl1/bl1_1/CMakeLists.txt

@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Copyright (c) 2021-2023, Arm Limited. All rights reserved.
+# Copyright (c) 2021-2024, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -26,6 +26,16 @@ target_link_options(bl1_1
         $<$<C_COMPILER_ID:IAR>:--map\;${CMAKE_BINARY_DIR}/bin/bl1_1.map>
 )
 
+target_compile_options(bl1_1
+    PUBLIC
+        ${BL1_COMPILER_CP_FLAG}
+)
+
+target_link_options(bl1_1
+    PUBLIC
+        ${BL1_LINKER_CP_OPTION}
+)
+
 target_sources(bl1_1
     PRIVATE
         main.c

bl1/bl1_1/bl1_1_shared_symbols.txt

@@ -17,3 +17,6 @@ tfm_plat_init_nv_counter
 tfm_plat_otp_read
 tfm_plat_read_nv_counter
 tfm_plat_set_nv_counter
+__ubsan_*
+log_error
+log_error_permissions_check

bl1/bl1_1/lib/CMakeLists.txt

@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Copyright (c) 2021-2023, Arm Limited. All rights reserved.
+# Copyright (c) 2021-2024, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -11,7 +11,7 @@ target_sources(bl1_1_lib
     INTERFACE
         $<$<BOOL:${TFM_BL1_DEFAULT_PROVISIONING}>:${CMAKE_CURRENT_SOURCE_DIR}/provisioning.c>
         $<$<BOOL:${TFM_BL1_2_IN_OTP}>:${CMAKE_CURRENT_SOURCE_DIR}/image_otp.c>
-        $<$<NOT:$<BOOL:${TFM_BL1_2_IN_OTP}>>:${CMAKE_CURRENT_SOURCE_DIR}/image_flash.c>
+        $<$<BOOL:${TFM_BL1_2_IN_FLASH}>:${CMAKE_CURRENT_SOURCE_DIR}/image_flash.c>
 )
 
 target_include_directories(bl1_1_lib

bl1/bl1_1/lib/image_flash.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2022-2024, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -12,16 +12,17 @@
 #include "region_defs.h"
 #include "fih.h"
 
-extern ARM_DRIVER_FLASH FLASH_DEV_NAME;
+extern ARM_DRIVER_FLASH FLASH_DEV_NAME_BL1;
 
 fih_int bl1_read_bl1_2_image(uint8_t *image)
 {
-    uint32_t flash_offset;
     fih_int fih_rc;
 
-    fih_rc = fih_int_encode(FLASH_DEV_NAME.ReadData(BL1_2_IMAGE_FLASH_OFFSET,
-                                                    image,
-                                                    BL1_2_CODE_SIZE);
+    fih_rc = fih_int_encode_zero_equality(
+                fih_not_eq(BL1_2_CODE_SIZE,
+                           (FLASH_DEV_NAME_BL1.ReadData(BL1_2_IMAGE_FLASH_OFFSET,
+                                                        image,
+                                                        BL1_2_CODE_SIZE))));
 
     FIH_RET(fih_rc);
 }

bl1/bl1_1/lib/provisioning.c

@@ -135,10 +135,20 @@ enum tfm_plat_err_t tfm_plat_provisioning_perform(void)
             return TFM_PLAT_ERR_INVALID_INPUT;
         }
 
+        err = tfm_plat_otp_secure_provisioning_start();
+        if (err != TFM_PLAT_ERR_SUCCESS) {
+            return err;
+        }
+
         err = provision_assembly_and_test();
         if (err != TFM_PLAT_ERR_SUCCESS) {
             return err;
         }
+
+        err = tfm_plat_otp_secure_provisioning_finish();
+        if (err != TFM_PLAT_ERR_SUCCESS) {
+            return err;
+        }
     }
 
     return TFM_PLAT_ERR_SUCCESS;

bl1/bl1_1/main.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2023, Arm Limited. All rights reserved.
+ * Copyright (c) 2021-2024, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -10,7 +10,9 @@
 #include "tfm_plat_provisioning.h"
 #include "tfm_plat_otp.h"
 #include "boot_hal.h"
+#ifdef TFM_MEASURED_BOOT_API
 #include "boot_measurement.h"
+#endif /* TFM_MEASURED_BOOT_API */
 #include "psa/crypto.h"
 #include "region_defs.h"
 #include "log.h"
@@ -55,7 +57,7 @@ static void collect_boot_measurement(void)
 }
 #endif /* TFM_MEASURED_BOOT_API */
 
-static fih_int validate_image_at_addr(uint8_t *image)
+fih_int validate_image_at_addr(const uint8_t *image)
 {
     enum tfm_plat_err_t plat_err;
     uint8_t stored_bl1_2_hash[BL1_2_HASH_SIZE];
@@ -85,7 +87,9 @@ static fih_int validate_image_at_addr(uint8_t *image)
 
 int main(void)
 {
+    int rc;
     fih_int fih_rc = FIH_FAILURE;
+    fih_int recovery_succeeded = FIH_FAILURE;
 
     fih_rc = fih_int_encode_zero_equality(boot_platform_init());
     if (fih_not_eq(fih_rc, FIH_SUCCESS)) {
@@ -116,17 +120,24 @@ int main(void)
         FIH_PANIC;
     }
 
-    /* Copy BL1_2 from OTP into SRAM*/
-    FIH_CALL(bl1_read_bl1_2_image, fih_rc, (uint8_t *)BL1_2_CODE_START);
-    if (fih_not_eq(fih_rc, FIH_SUCCESS)) {
-        FIH_PANIC;
-    }
+    do {
+        /* Copy BL1_2 from OTP into SRAM*/
+        FIH_CALL(bl1_read_bl1_2_image, fih_rc, (uint8_t *)BL1_2_CODE_START);
+        if (fih_not_eq(fih_rc, FIH_SUCCESS)) {
+            FIH_PANIC;
+        }
 
-    FIH_CALL(validate_image_at_addr, fih_rc, (uint8_t *)BL1_2_CODE_START);
-    if (fih_not_eq(fih_rc, FIH_SUCCESS)) {
-        BL1_LOG("[ERR] BL1_2 image failed to validate\r\n");
-        FIH_PANIC;
-    }
+        FIH_CALL(validate_image_at_addr, fih_rc, (uint8_t *)BL1_2_CODE_START);
+
+        if (fih_not_eq(fih_rc, FIH_SUCCESS)) {
+            BL1_LOG("[ERR] BL1_2 image failed to validate\r\n");
+
+            recovery_succeeded = fih_int_encode_zero_equality(boot_initiate_recovery_mode(0));
+            if (fih_not_eq(recovery_succeeded, FIH_SUCCESS)) {
+                FIH_PANIC;
+            }
+        }
+    } while (fih_not_eq(fih_rc, FIH_SUCCESS));
 
     fih_rc = fih_int_encode_zero_equality(boot_platform_post_load(0));
     if (fih_not_eq(fih_rc, FIH_SUCCESS)) {

bl1/bl1_1/shared_lib/CMakeLists.txt

@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Copyright (c) 2021-2023, Arm Limited. All rights reserved.
+# Copyright (c) 2021-2024, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -24,7 +24,7 @@ target_link_libraries(bl1_1_shared_lib_interface
 
 target_sources(bl1_1_shared_lib
     PRIVATE
-        $<$<BOOL:${TFM_BL1_SOFTWARE_CRYPTO}>:crypto/crypto_mbedcrypto>
+        $<$<BOOL:${TFM_BL1_SOFTWARE_CRYPTO}>:crypto/crypto_mbedcrypto.c>
         $<$<BOOL:${TFM_BL1_DUMMY_TRNG}>:trng/trng_dummy.c>
         ./util.c
         $<$<BOOL:${TFM_BL1_DEFAULT_OTP}>:./otp/otp_default.c>
@@ -47,7 +47,8 @@ target_link_libraries(bl1_1_shared_lib
 target_compile_options(bl1_1_shared_lib_interface
     INTERFACE
         #Prevents warnings caused by C99 static assert workaround
-        -Wno-unused-local-typedefs
+        $<$<C_COMPILER_ID:GNU>:-Wno-unused-local-typedefs>
+        $<$<C_COMPILER_ID:ARMClang>:-Wno-unused-local-typedefs>
 )
 
 target_compile_definitions(bl1_1_shared_lib_interface
@@ -58,8 +59,6 @@ target_compile_definitions(bl1_1_shared_lib_interface
 )
 
 if(TFM_BL1_SOFTWARE_CRYPTO)
-    cmake_policy(SET CMP0079 NEW)
-
     set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
     set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
     set(ENABLE_TESTING OFF)
@@ -106,4 +105,34 @@ if(TFM_BL1_SOFTWARE_CRYPTO)
             $<$<C_COMPILER_ID:GNU>:-Wno-unused-parameter>
             $<$<C_COMPILER_ID:ARMClang>:-Wno-unused-parameter>
     )
+
+    target_compile_options(bl1_1_crypto_mbedcrypto
+        PRIVATE
+            ${BL1_COMPILER_CP_FLAG}
+    )
+
+    target_link_options(bl1_1_crypto_mbedcrypto
+        PUBLIC
+            ${BL1_LINKER_CP_OPTION}
+    )
+
+    target_compile_options(bl1_1_crypto_mbedtls
+        PRIVATE
+            ${BL1_COMPILER_CP_FLAG}
+    )
+
+    target_link_options(bl1_1_crypto_mbedtls
+        PUBLIC
+            ${BL1_LINKER_CP_OPTION}
+    )
+
+    target_compile_options(bl1_1_crypto_mbedx509
+        PRIVATE
+            ${BL1_COMPILER_CP_FLAG}
+    )
+
+    target_link_options(bl1_1_crypto_mbedx509
+        PUBLIC
+            ${BL1_LINKER_CP_OPTION}
+    )
 endif()

bl1/bl1_1/shared_lib/crypto/crypto_mbedcrypto.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2021-2024, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -10,18 +10,58 @@
 #include <string.h>
 #include "mbedtls/sha256.h"
 #include "mbedtls/aes.h"
+#include "mbedtls/hkdf.h"
+#include "mbedtls/md.h"
 #include "mbedtls/memory_buffer_alloc.h"
 #include "otp.h"
 
 static int mbedtls_is_initialised = 0;
-static uint8_t mbedtls_memory_buf[256];
+static uint8_t mbedtls_memory_buf[512];
 
 static void mbedtls_init(uint8_t mbedtls_memory_buf[], size_t size)
 {
     mbedtls_memory_buffer_alloc_init(mbedtls_memory_buf,
                                      size);
 }
 
+int32_t bl1_derive_key(enum tfm_bl1_key_id_t input_key, const uint8_t *label,
+                       size_t label_length, const uint8_t *context,
+                       size_t context_length, uint8_t *output_key,
+                       size_t output_length)
+{
+    int rc = 0;
+    uint8_t state[64] = {0};
+    uint8_t key_buf[32] = {0};
+    uint32_t state_len = context_length + label_length;
+    const mbedtls_md_info_t *sha256_info = NULL;
+
+    if (state_len > sizeof(state)) {
+        return -1;
+    }
+
+    memcpy(state, label, label_length);
+    memcpy(&state[label_length], context, context_length);
+
+    if (!mbedtls_is_initialised) {
+        mbedtls_init(mbedtls_memory_buf, sizeof(mbedtls_memory_buf));
+        mbedtls_is_initialised = 1;
+    }
+
+    rc = bl1_otp_read_key(input_key, key_buf);
+    if (rc) {
+        return rc;
+    }
+
+
+    sha256_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA256);
+
+    rc = mbedtls_hkdf(sha256_info, NULL, 0, key_buf,
+                      sizeof(key_buf), state, state_len,
+                      output_key, output_length);
+
+    return rc;
+}
+
 int32_t bl1_sha256_compute(const uint8_t *data,
                            size_t data_length,
                            uint8_t *hash)
@@ -61,6 +101,7 @@ int32_t bl1_sha256_compute(const uint8_t *data,
 }
 
 int32_t bl1_aes_256_ctr_decrypt(enum tfm_bl1_key_id_t key_id,
+                                const uint8_t *key_material,
                                 uint8_t *counter,
                                 const uint8_t *ciphertext,
                                 size_t ciphertext_length,
@@ -71,6 +112,7 @@ int32_t bl1_aes_256_ctr_decrypt(enum tfm_bl1_key_id_t key_id,
     uint8_t key_buf[32];
     mbedtls_aes_context ctx;
     size_t nc_off = 0;
+    const uint8_t *input_key = key_buf;
 
     if (ciphertext_length == 0) {
         return 0;
@@ -80,18 +122,24 @@ int32_t bl1_aes_256_ctr_decrypt(enum tfm_bl1_key_id_t key_id,
         return -2;
     }
 
+    if (key_material == NULL) {
+        rc = bl1_otp_read_key(key_id, key_buf);
+        if (rc) {
+            return rc;
+        }
+    } else {
+        input_key = key_material;
+    }
+
+
     if (!mbedtls_is_initialised) {
         mbedtls_init(mbedtls_memory_buf, sizeof(mbedtls_memory_buf));
         mbedtls_is_initialised = 1;
     }
 
     mbedtls_aes_init(&ctx);
-    rc = otp_read_key(key_id, key_buf);
-    if (rc) {
-        goto out;
-    }
 
-    rc = mbedtls_aes_setkey_enc(&ctx, key_buf, 256);
+    rc = mbedtls_aes_setkey_enc(&ctx, input_key, 256);
     if (rc) {
         goto out;
     }