LIB: Update secure partitions with new logging API
Change-Id: Ic4651000ac3c22f54f329d0e0aebb41ffb839b34
Signed-off-by: Jackson Cooper-Driver <jackson.cooper-driver@arm.com>
diff --git a/partitions/dice_protection_environment/CMakeLists.txt b/partitions/dice_protection_environment/CMakeLists.txt
index a2609b8..c111503 100644
--- a/partitions/dice_protection_environment/CMakeLists.txt
+++ b/partitions/dice_protection_environment/CMakeLists.txt
@@ -125,7 +125,7 @@
-DTFM_PATH=${CMAKE_SOURCE_DIR} # To locate tfm_t_cose.cmake
-DT_COSE_PATH=${T_COSE_PATH} # External dependency
-DTFM_TEST_PATH=${TFM_TEST_PATH} # To locate test framework src
- -DTFM_PARTITION_LOG_LEVEL=${TFM_PARTITION_LOG_LEVEL}
+ -DLOG_LEVEL_UNPRIV=${TFM_PARTITION_LOG_LEVEL}
$<$<BOOL:${AFL_CC}>:-DCMAKE_C_COMPILER=${AFL_CC}>
$<$<BOOL:${AFL_CC}>:-DFUZZ_TEST=ON>
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_CURRENT_BINARY_DIR}/dpe_host
diff --git a/partitions/dice_protection_environment/dpe_log.c b/partitions/dice_protection_environment/dpe_log.c
index afbd951..0eea2e7 100644
--- a/partitions/dice_protection_environment/dpe_log.c
+++ b/partitions/dice_protection_environment/dpe_log.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023-2024, Arm Limited. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright The TrustedFirmware-M Contributors
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -8,7 +8,7 @@
#include "dpe_log.h"
#include "dpe_context_mngr.h"
-#if (TFM_PARTITION_LOG_LEVEL >= TFM_PARTITION_LOG_LEVEL_DEBUG)
+#if (LOG_LEVEL_UNPRIV >= LOG_LEVEL_VERBOSE)
#define LOG_BOOL_VAL(arg) ((arg) ? "true" : "false")
static void print_byte_array(const uint8_t *array, size_t len)
@@ -18,50 +18,50 @@
if (array != NULL) {
for (i = 0; i < len; ++i) {
if ((i & 0xF) == 0) {
- LOG_DBGFMT("\r\n ");
+ VERBOSE_UNPRIV_RAW("\n ");
}
if (array[i] < 0x10) {
- LOG_DBGFMT(" 0%x", array[i]);
+ VERBOSE_UNPRIV_RAW(" 0%x", array[i]);
} else {
- LOG_DBGFMT(" %x", array[i]);
+ VERBOSE_UNPRIV_RAW(" %x", array[i]);
}
}
}
- LOG_DBGFMT("\r\n");
+ VERBOSE_UNPRIV_RAW("\n");
}
static void log_dice_inputs(const DiceInputValues *input)
{
- LOG_DBGFMT(" - DICE code_hash =");
+ VERBOSE_UNPRIV_RAW(" - DICE code_hash =");
print_byte_array(input->code_hash, sizeof(input->code_hash));
- LOG_DBGFMT(" - DICE code_descriptor =");
+ VERBOSE_UNPRIV_RAW(" - DICE code_descriptor =");
print_byte_array(input->code_descriptor, input->code_descriptor_size);
- LOG_DBGFMT(" - DICE config_type = %d\r\n", input->config_type);
- LOG_DBGFMT(" - DICE config_value =");
+ VERBOSE_UNPRIV_RAW(" - DICE config_type = %d\n", input->config_type);
+ VERBOSE_UNPRIV_RAW(" - DICE config_value =");
print_byte_array(input->config_value, sizeof(input->config_value));
- LOG_DBGFMT(" - DICE config_descriptor =");
+ VERBOSE_UNPRIV_RAW(" - DICE config_descriptor =");
print_byte_array(input->config_descriptor, input->config_descriptor_size);
- LOG_DBGFMT(" - DICE authority_hash =");
+ VERBOSE_UNPRIV_RAW(" - DICE authority_hash =");
print_byte_array(input->authority_hash, sizeof(input->authority_hash));
- LOG_DBGFMT(" - DICE authority_descriptor =");
+ VERBOSE_UNPRIV_RAW(" - DICE authority_descriptor =");
print_byte_array(input->authority_descriptor,
input->authority_descriptor_size);
- LOG_DBGFMT(" - DICE mode = %d\r\n", input->mode);
- LOG_DBGFMT(" - DICE hidden =");
+ VERBOSE_UNPRIV_RAW(" - DICE mode = %d\n", input->mode);
+ VERBOSE_UNPRIV_RAW(" - DICE hidden =");
print_byte_array(input->hidden, sizeof(input->hidden));
}
void log_derive_rot_context(const DiceInputValues *dice_inputs)
{
- LOG_DBGFMT("DPE DeriveRoTContext:\r\n");
+ VERBOSE_UNPRIV_RAW("DPE DeriveRoTContext:\n");
log_dice_inputs(dice_inputs);
}
static void log_handle(int context_handle)
{
- LOG_DBGFMT(" index - %d,", GET_IDX(context_handle));
- LOG_DBGFMT(" nonce - 0x%x\r\n", GET_NONCE(context_handle));
+ VERBOSE_UNPRIV_RAW(" index - %d,", GET_IDX(context_handle));
+ VERBOSE_UNPRIV_RAW(" nonce - 0x%x\n", GET_NONCE(context_handle));
}
void log_derive_context(int context_handle,
@@ -72,23 +72,23 @@
const DiceInputValues *dice_inputs,
int32_t client_id)
{
- LOG_DBGFMT("DPE DeriveContext:\r\n");
- LOG_DBGFMT(" - input context handle:");
+ VERBOSE_UNPRIV_RAW("DPE DeriveContext:\n");
+ VERBOSE_UNPRIV_RAW(" - input context handle:");
log_handle(context_handle);
- LOG_DBGFMT(" - cert_id = 0x%x\r\n", cert_id);
- LOG_DBGFMT(" - retain_parent_context = %s\r\n", LOG_BOOL_VAL(retain_parent_context));
- LOG_DBGFMT(" - allow_new_context_to_derive = %s\r\n", LOG_BOOL_VAL(allow_new_context_to_derive));
- LOG_DBGFMT(" - create_certificate = %s\r\n", LOG_BOOL_VAL(create_certificate));
+ VERBOSE_UNPRIV_RAW(" - cert_id = 0x%x\n", cert_id);
+ VERBOSE_UNPRIV_RAW(" - retain_parent_context = %s\n", LOG_BOOL_VAL(retain_parent_context));
+ VERBOSE_UNPRIV_RAW(" - allow_new_context_to_derive = %s\n", LOG_BOOL_VAL(allow_new_context_to_derive));
+ VERBOSE_UNPRIV_RAW(" - create_certificate = %s\n", LOG_BOOL_VAL(create_certificate));
log_dice_inputs(dice_inputs);
- LOG_DBGFMT(" - client_id = %d\r\n", client_id);
+ VERBOSE_UNPRIV_RAW(" - client_id = %d\n", client_id);
}
void log_destroy_context(int context_handle, bool destroy_recursively)
{
- LOG_DBGFMT("DPE DestroyContext:\r\n");
- LOG_DBGFMT(" - input context handle:");
+ VERBOSE_UNPRIV_RAW("DPE DestroyContext:\n");
+ VERBOSE_UNPRIV_RAW(" - input context handle:");
log_handle(context_handle);
- LOG_DBGFMT(" - destroy_recursively = %s\r\n", LOG_BOOL_VAL(destroy_recursively));
+ VERBOSE_UNPRIV_RAW(" - destroy_recursively = %s\n", LOG_BOOL_VAL(destroy_recursively));
}
void log_certify_key(int context_handle,
@@ -98,13 +98,13 @@
const uint8_t *label,
size_t label_size)
{
- LOG_DBGFMT("DPE CertifyKey:\r\n");
- LOG_DBGFMT(" - input context handle:");
+ VERBOSE_UNPRIV_RAW("DPE CertifyKey:\n");
+ VERBOSE_UNPRIV_RAW(" - input context handle:");
log_handle(context_handle);
- LOG_DBGFMT(" - retain_context = %s\r\n", LOG_BOOL_VAL(retain_context));
- LOG_DBGFMT(" - public_key =");
+ VERBOSE_UNPRIV_RAW(" - retain_context = %s\n", LOG_BOOL_VAL(retain_context));
+ VERBOSE_UNPRIV_RAW(" - public_key =");
print_byte_array(public_key, public_key_size);
- LOG_DBGFMT(" - label =");
+ VERBOSE_UNPRIV_RAW(" - label =");
print_byte_array(label, label_size);
}
@@ -113,82 +113,82 @@
bool clear_from_context,
size_t cert_chain_buf_size)
{
- LOG_DBGFMT("DPE GetCertificateChain:\r\n");
- LOG_DBGFMT(" - input context handle:");
+ VERBOSE_UNPRIV_RAW("DPE GetCertificateChain:\n");
+ VERBOSE_UNPRIV_RAW(" - input context handle:");
log_handle(context_handle);
- LOG_DBGFMT(" - retain_context = %s\r\n", LOG_BOOL_VAL(retain_context));
- LOG_DBGFMT(" - clear_from_context = %s\r\n", LOG_BOOL_VAL(clear_from_context));
- LOG_DBGFMT(" - cert_chain_buf_size = %d\r\n", cert_chain_buf_size);
+ VERBOSE_UNPRIV_RAW(" - retain_context = %s\n", LOG_BOOL_VAL(retain_context));
+ VERBOSE_UNPRIV_RAW(" - clear_from_context = %s\n", LOG_BOOL_VAL(clear_from_context));
+ VERBOSE_UNPRIV_RAW(" - cert_chain_buf_size = %d\n", cert_chain_buf_size);
}
void log_intermediate_certificate(const uint8_t *cert_buf,
size_t cert_size)
{
- LOG_DBGFMT("DPE Intermediate Certificate:\r\n");
- LOG_DBGFMT(" - size = %d\r\n", cert_size);
- LOG_DBGFMT(" - certificate =");
+ VERBOSE_UNPRIV_RAW("DPE Intermediate Certificate:\n");
+ VERBOSE_UNPRIV_RAW(" - size = %d\n", cert_size);
+ VERBOSE_UNPRIV_RAW(" - certificate =");
print_byte_array(cert_buf, cert_size);
}
void log_certificate_chain(const uint8_t *certificate_chain_buf,
size_t certificate_chain_size)
{
- LOG_DBGFMT("DPE Certificate Chain:\r\n");
- LOG_DBGFMT(" - size = %d\r\n", certificate_chain_size);
+ VERBOSE_UNPRIV_RAW("DPE Certificate Chain:\n");
+ VERBOSE_UNPRIV_RAW(" - size = %d\n", certificate_chain_size);
print_byte_array(certificate_chain_buf, certificate_chain_size);
}
void log_derive_context_output_handles(int parent_context_handle,
int new_context_handle)
{
- LOG_DBGFMT("DPE DeriveContext output handles:\r\n");
- LOG_DBGFMT(" - parent context handle:");
+ VERBOSE_UNPRIV_RAW("DPE DeriveContext output handles:\n");
+ VERBOSE_UNPRIV_RAW(" - parent context handle:");
log_handle(parent_context_handle);
- LOG_DBGFMT(" - new context handle:");
+ VERBOSE_UNPRIV_RAW(" - new context handle:");
log_handle(new_context_handle);
}
void log_certify_key_output_handle(int new_context_handle)
{
- LOG_DBGFMT("DPE CertifyKey output handle:\r\n");
- LOG_DBGFMT(" - new context handle:");
+ VERBOSE_UNPRIV_RAW("DPE CertifyKey output handle:\n");
+ VERBOSE_UNPRIV_RAW(" - new context handle:");
log_handle(new_context_handle);
}
void log_get_certificate_chain_output_handle(int new_context_handle)
{
- LOG_DBGFMT("DPE GetCertificateChain output handle:\r\n");
- LOG_DBGFMT(" - new context handle:");
+ VERBOSE_UNPRIV_RAW("DPE GetCertificateChain output handle:\n");
+ VERBOSE_UNPRIV_RAW(" - new context handle:");
log_handle(new_context_handle);
}
void log_dpe_component_ctx_metadata(const struct component_context_t *ctx_ptr,
int component_index)
{
- LOG_DBGFMT(" DPE component_ctx_array[%d]: \r\n", component_index);
- LOG_DBGFMT(" - in_use = %s\r\n", LOG_BOOL_VAL(ctx_ptr->in_use));
- LOG_DBGFMT(" - is_allowed_to_derive = %s\r\n",
+ VERBOSE_UNPRIV_RAW(" DPE component_ctx_array[%d]: \n", component_index);
+ VERBOSE_UNPRIV_RAW(" - in_use = %s\n", LOG_BOOL_VAL(ctx_ptr->in_use));
+ VERBOSE_UNPRIV_RAW(" - is_allowed_to_derive = %s\n",
LOG_BOOL_VAL(ctx_ptr->is_allowed_to_derive));
- LOG_DBGFMT(" - is_export_cdi_allowed = %s\r\n",
+ VERBOSE_UNPRIV_RAW(" - is_export_cdi_allowed = %s\n",
LOG_BOOL_VAL(ctx_ptr->is_export_cdi_allowed));
- LOG_DBGFMT(" - nonce = 0x%x\r\n", ctx_ptr->nonce);
- LOG_DBGFMT(" - target_locality = %d\r\n", ctx_ptr->target_locality);
- LOG_DBGFMT(" - expected_mhu_id = %u\r\n", ctx_ptr->expected_mhu_id);
- LOG_DBGFMT(" - parent_comp_ctx->nonce = %d\r\n", ctx_ptr->parent_comp_ctx->nonce);
+ VERBOSE_UNPRIV_RAW(" - nonce = 0x%x\n", ctx_ptr->nonce);
+ VERBOSE_UNPRIV_RAW(" - target_locality = %d\n", ctx_ptr->target_locality);
+ VERBOSE_UNPRIV_RAW(" - expected_mhu_id = %u\n", ctx_ptr->expected_mhu_id);
+ VERBOSE_UNPRIV_RAW(" - parent_comp_ctx->nonce = %d\n", ctx_ptr->parent_comp_ctx->nonce);
if (ctx_ptr->linked_cert_ctx != NULL) {
- LOG_DBGFMT(" - linked_cert_ctx->cert_id = %d\r\n",
+ VERBOSE_UNPRIV_RAW(" - linked_cert_ctx->cert_id = %d\n",
ctx_ptr->linked_cert_ctx->cert_id);
}
}
void log_dpe_cert_ctx_metadata(const struct cert_context_t *ctx_ptr)
{
- LOG_DBGFMT(" DPE cert_ctx_array[]: \r\n");
- LOG_DBGFMT(" - cert_id = 0x%x\r\n", ctx_ptr->cert_id);
- LOG_DBGFMT(" - state = %d\r\n", ctx_ptr->state);
- LOG_DBGFMT(" - is_external_pub_key_provided = %s\r\n",
+ VERBOSE_UNPRIV_RAW(" DPE cert_ctx_array[]: \n");
+ VERBOSE_UNPRIV_RAW(" - cert_id = 0x%x\n", ctx_ptr->cert_id);
+ VERBOSE_UNPRIV_RAW(" - state = %d\n", ctx_ptr->state);
+ VERBOSE_UNPRIV_RAW(" - is_external_pub_key_provided = %s\n",
LOG_BOOL_VAL(ctx_ptr->is_external_pub_key_provided));
- LOG_DBGFMT(" - is_cdi_to_be_exported = %s\r\n",
+ VERBOSE_UNPRIV_RAW(" - is_cdi_to_be_exported = %s\n",
LOG_BOOL_VAL(ctx_ptr->is_cdi_to_be_exported));
}
@@ -214,4 +214,4 @@
}
}
-#endif /* TFM_PARTITION_LOG_LEVEL */
+#endif /* LOG_LEVEL_UNPRIV */
diff --git a/partitions/dice_protection_environment/dpe_log.h b/partitions/dice_protection_environment/dpe_log.h
index 68b1871..8257aae 100644
--- a/partitions/dice_protection_environment/dpe_log.h
+++ b/partitions/dice_protection_environment/dpe_log.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023-2024, Arm Limited. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright The TrustedFirmware-M Contributors
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -10,13 +10,13 @@
#include "dice_protection_environment.h"
#include "dpe_context_mngr.h"
-#include "tfm_sp_log.h"
+#include "tfm_log_unpriv.h"
#ifdef __cplusplus
extern "C" {
#endif
-#if (TFM_PARTITION_LOG_LEVEL >= TFM_PARTITION_LOG_LEVEL_DEBUG)
+#if (LOG_LEVEL_UNPRIV >= LOG_LEVEL_VERBOSE)
/**
* \brief Log the derive rot context command parameters.
@@ -108,7 +108,7 @@
uint8_t *new_certificate_buf,
size_t *new_certificate_actual_size);
-#else /* TFM_PARTITION_LOG_LEVEL */
+#else /* LOG_LEVEL_UNPRIV */
#define log_derive_rot_context(...)
#define log_derive_context(...)
@@ -124,7 +124,7 @@
#define log_dpe_cert_ctx_metadata(...)
#define log_derive_context_output(...)
-#endif /* TFM_PARTITION_LOG_LEVEL */
+#endif /* LOG_LEVEL_UNPRIV */
#ifdef __cplusplus
}
diff --git a/partitions/dice_protection_environment/test/host/CMakeLists.txt b/partitions/dice_protection_environment/test/host/CMakeLists.txt
index 1a5040f..89ed028 100644
--- a/partitions/dice_protection_environment/test/host/CMakeLists.txt
+++ b/partitions/dice_protection_environment/test/host/CMakeLists.txt
@@ -86,7 +86,6 @@
../..
${TFM_PATH}/platform/ext/target/arm/rse/common # platform_locality.h
${TFM_PATH}/platform/ext/target/arm/rse/common/dpe # dpe_plat.h
- ${TFM_PATH}/secure_fw/partitions/lib/runtime/include # tfm_sp_log.h
PRIVATE
${TFM_PATH}/secure_fw/include # array.h
@@ -102,7 +101,7 @@
target_compile_definitions(dpe_lib
PUBLIC
- TFM_PARTITION_LOG_LEVEL=${TFM_PARTITION_LOG_LEVEL}
+ LOG_LEVEL_UNPRIV=${TFM_PARTITION_LOG_LEVEL}
PRIVATE
DPE_TEST_MODE
)
diff --git a/partitions/dice_protection_environment/test/host/cmd.c b/partitions/dice_protection_environment/test/host/cmd.c
index 314b0bd..d913953 100644
--- a/partitions/dice_protection_environment/test/host/cmd.c
+++ b/partitions/dice_protection_environment/test/host/cmd.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2024, Arm Limited. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright The TrustedFirmware-M Contributors
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -24,7 +24,7 @@
#include "dpe_test_data.h"
#include "dpe_test_private.h"
-#include "tfm_sp_log.h"
+#include "tfm_log_unpriv.h"
#define CLIENT_ID_NS -1
@@ -121,17 +121,17 @@
if (buf != NULL) {
for (i = 0; i < size; ++i) {
if ((i & 0xF) == 0) {
- LOG_DBGFMT("\r\n");
+ VERBOSE_UNPRIV_RAW("\n");
}
if (buf[i] < 0x10) {
- LOG_DBGFMT(" 0%x", buf[i]);
+ VERBOSE_UNPRIV_RAW(" 0%x", buf[i]);
} else {
- LOG_DBGFMT(" %x", buf[i]);
+ VERBOSE_UNPRIV_RAW(" %x", buf[i]);
}
}
}
- LOG_DBGFMT("\r\n");
- LOG_DBGFMT("\r\n");
+ VERBOSE_UNPRIV_RAW("\n");
+ VERBOSE_UNPRIV_RAW("\n");
}
static void build_internal_state(int *context_handle, unsigned char test_data_id)
@@ -139,7 +139,7 @@
struct test_result_t test_ret = {0};
int err;
- LOG_DBGFMT("\nDeriving RoT context:\n");
+ VERBOSE_UNPRIV_RAW("\nDeriving RoT context:\n");
derive_rot_certificate_context(&test_ret);
if (test_ret.val != TEST_PASSED) {
printf("ERROR: RoT context derivation failed\n");
@@ -147,16 +147,16 @@
}
if (test_data_id < ARRAY_SIZE(test_data)) {
- LOG_DBGFMT("\nBuilding internal state: test_data[%d]\n", test_data_id);
+ VERBOSE_UNPRIV_RAW("\nBuilding internal state: test_data[%d]\n", test_data_id);
err = build_certificate_chain(&test_data[test_data_id]);
if (err) {
printf("\nERROR: Building certificate chain based on test data failed: %d\n", err);
exit(1);
}
- LOG_DBGFMT("Building internal state: Done\n\n");
+ VERBOSE_UNPRIV_RAW("Building internal state: Done\n\n");
*context_handle = get_last_context_handle(&test_data[test_data_id]);
} else {
- LOG_DBGFMT("Building internal state: No\n\n");
+ VERBOSE_UNPRIV_RAW("Building internal state: No\n\n");
*context_handle = retained_rot_ctx_handle;
}
}
@@ -207,14 +207,14 @@
(void)context_handle;
- LOG_DBGFMT("DPE request (%ld):\n", cmd_in_size);
+ VERBOSE_UNPRIV_RAW("DPE request (%ld):\n", cmd_in_size);
print_buf(cmd_in_buf, cmd_in_size);
err = dpe_command_decode(CLIENT_ID_NS,
cmd_in_buf, cmd_in_size,
cmd_out_buf, &cmd_out_size);
- LOG_DBGFMT("DPE response (%ld):\n", cmd_out_size);
+ VERBOSE_UNPRIV_RAW("DPE response (%ld):\n", cmd_out_size);
print_buf(cmd_out_buf, cmd_out_size);
return err;
@@ -271,13 +271,13 @@
err = CALL_DERIVE_CONTEXT(dc_input, dc_output);
if (dc_output.certificate_actual_size > 0) {
- LOG_DBGFMT("Certificate:\n");
+ VERBOSE_UNPRIV_RAW("Certificate:\n");
print_buf(dc_output.certificate_buf,
dc_output.certificate_actual_size);
}
if (dc_output.exported_cdi_actual_size > 0) {
- LOG_DBGFMT("CDIs:\n");
+ VERBOSE_UNPRIV_RAW("CDIs:\n");
print_buf(dc_output.exported_cdi_buf,
dc_output.exported_cdi_actual_size);
}
@@ -325,13 +325,13 @@
err = CALL_CERTIFY_KEY(ck_input, ck_output);
if (ck_output.certificate_chain_actual_size > 0) {
- LOG_DBGFMT("Certificate:\n");
+ VERBOSE_UNPRIV_RAW("Certificate:\n");
print_buf(ck_output.certificate_chain_buf,
ck_output.certificate_chain_actual_size);
}
if (ck_output.derived_public_key_actual_size > 0) {
- LOG_DBGFMT("Public key:\n");
+ VERBOSE_UNPRIV_RAW("Public key:\n");
print_buf(ck_output.derived_public_key_buf,
ck_output.derived_public_key_actual_size);
}
@@ -375,7 +375,7 @@
&new_context_handle);
if (cert_size > 0) {
- LOG_DBGFMT("Certificate:\n");
+ VERBOSE_UNPRIV_RAW("Certificate:\n");
print_buf(cert_buf, cert_size);
}
diff --git a/partitions/dice_protection_environment/test/host/main.c b/partitions/dice_protection_environment/test/host/main.c
index e2cc588..43a435e 100644
--- a/partitions/dice_protection_environment/test/host/main.c
+++ b/partitions/dice_protection_environment/test/host/main.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2024, Arm Limited. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright The TrustedFirmware-M Contributors
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -10,7 +10,7 @@
#include <stdlib.h>
#include "dice_protection_environment.h"
-#include "tfm_sp_log.h"
+#include "tfm_log_unpriv.h"
#include "extra_s_tests.h"
#include "test_framework.h"
@@ -108,7 +108,7 @@
} else if (argc == 3) {
/****************** Input params are provided *************************/
- LOG_INFFMT("Execute DPE API test (%s %s)\n", argv[1], argv[2]);
+ INFO_UNPRIV_RAW("Execute DPE API test (%s %s)\n", argv[1], argv[2]);
ret = read_cmd(argv[2], cmd_in_buf, &cmd_in_size);
if (ret < 0) {
exit(1);
diff --git a/partitions/dice_protection_environment/test/host/plat.c b/partitions/dice_protection_environment/test/host/plat.c
index 3be08bd..043d0a6 100644
--- a/partitions/dice_protection_environment/test/host/plat.c
+++ b/partitions/dice_protection_environment/test/host/plat.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2024, Arm Limited. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright The TrustedFirmware-M Contributors
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -8,7 +8,7 @@
#include <stdio.h>
#include "dpe_plat.h"
-#include "tfm_sp_log.h"
+#include "tfm_log_unpriv.h"
extern psa_key_id_t rot_cdi_id;
extern psa_key_id_t root_attest_key_id;