From d5a52b05ab5a4999117b308c9551219ebb09c078 Mon Sep 17 00:00:00 2001 From: Jonathan Nilsen Date: Wed, 8 Jan 2025 17:14:26 +0100 Subject: [PATCH] sdfw_services: regenerate zcbor encoders/decoders with current version Regenerate code using the current zcbor version. Signed-off-by: Jonathan Nilsen --- .../echo/zcbor_generated/CMakeLists.txt | 2 +- .../zcbor_generated/echo_service_decode.c | 54 +- .../zcbor_generated/echo_service_decode.h | 4 +- .../zcbor_generated/echo_service_encode.c | 54 +- .../zcbor_generated/echo_service_encode.h | 4 +- .../echo/zcbor_generated/echo_service_types.h | 4 +- .../psa_crypto/zcbor_generated/CMakeLists.txt | 2 +- .../psa_crypto_service_decode.c | 1219 +++++----------- .../psa_crypto_service_decode.h | 4 +- .../psa_crypto_service_encode.c | 1246 +++++------------ .../psa_crypto_service_encode.h | 4 +- .../psa_crypto_service_types.h | 4 +- .../reset_evt/zcbor_generated/CMakeLists.txt | 2 +- .../reset_evt_service_decode.c | 74 +- .../reset_evt_service_decode.h | 4 +- .../reset_evt_service_encode.c | 74 +- .../reset_evt_service_encode.h | 4 +- .../zcbor_generated/reset_evt_service_types.h | 4 +- .../zcbor_generated/CMakeLists.txt | 2 +- .../sdfw_update_service_decode.c | 45 +- .../sdfw_update_service_decode.h | 4 +- .../sdfw_update_service_encode.c | 45 +- .../sdfw_update_service_encode.h | 4 +- .../sdfw_update_service_types.h | 4 +- 24 files changed, 913 insertions(+), 1954 deletions(-) diff --git a/subsys/sdfw_services/services/echo/zcbor_generated/CMakeLists.txt b/subsys/sdfw_services/services/echo/zcbor_generated/CMakeLists.txt index 6775bb9108f8..afed88e04849 100644 --- a/subsys/sdfw_services/services/echo/zcbor_generated/CMakeLists.txt +++ b/subsys/sdfw_services/services/echo/zcbor_generated/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2024 Nordic Semiconductor ASA +# Copyright (c) 2025 Nordic Semiconductor ASA # # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # diff --git a/subsys/sdfw_services/services/echo/zcbor_generated/echo_service_decode.c b/subsys/sdfw_services/services/echo/zcbor_generated/echo_service_decode.c index 682fa3afb16c..ae428ff1aaf1 100644 --- a/subsys/sdfw_services/services/echo/zcbor_generated/echo_service_decode.c +++ b/subsys/sdfw_services/services/echo/zcbor_generated/echo_service_decode.c @@ -1,11 +1,11 @@ /* - * Copyright (c) 2024 Nordic Semiconductor ASA + * Copyright (c) 2025 Nordic Semiconductor ASA * * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ /* - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */ @@ -22,6 +22,17 @@ #error "The type file was generated with a different default_max_qty than this file" #endif +#define log_result(state, result, func) \ + do { \ + if (!result) { \ + zcbor_trace_file(state); \ + zcbor_log("%s error: %s\r\n", func, \ + zcbor_error_str(zcbor_peek_error(state))); \ + } else { \ + zcbor_log("%s success\r\n", func); \ + } \ + } while (0) + static bool decode_echo_service_rsp(zcbor_state_t *state, struct echo_service_rsp *result); static bool decode_echo_service_req(zcbor_state_t *state, struct zcbor_string *result); @@ -29,40 +40,27 @@ static bool decode_echo_service_rsp(zcbor_state_t *state, struct echo_service_rs { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((zcbor_list_start_decode(state) && - ((((zcbor_int32_decode(state, (&(*result).echo_service_rsp_ret)))) && - ((zcbor_tstr_decode(state, (&(*result).echo_service_rsp_str_out))))) || - (zcbor_list_map_end_force_decode(state), false)) && - zcbor_list_end_decode(state)))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((zcbor_list_start_decode(state) && + ((((zcbor_int32_decode(state, (&(*result).echo_service_rsp_ret)))) && + ((zcbor_tstr_decode(state, (&(*result).echo_service_rsp_str_out))))) || + (zcbor_list_map_end_force_decode(state), false)) && + zcbor_list_end_decode(state)))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_echo_service_req(zcbor_state_t *state, struct zcbor_string *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = (((zcbor_list_start_decode(state) && - ((((zcbor_tstr_decode(state, (&(*result)))))) || - (zcbor_list_map_end_force_decode(state), false)) && - zcbor_list_end_decode(state)))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((zcbor_list_start_decode(state) && + ((((zcbor_tstr_decode(state, (&(*result)))))) || + (zcbor_list_map_end_force_decode(state), false)) && + zcbor_list_end_decode(state)))); - return tmp_result; + log_result(state, res, __func__); + return res; } int cbor_decode_echo_service_req(const uint8_t *payload, size_t payload_len, diff --git a/subsys/sdfw_services/services/echo/zcbor_generated/echo_service_decode.h b/subsys/sdfw_services/services/echo/zcbor_generated/echo_service_decode.h index 284b67ff2716..e1a03679abc2 100644 --- a/subsys/sdfw_services/services/echo/zcbor_generated/echo_service_decode.h +++ b/subsys/sdfw_services/services/echo/zcbor_generated/echo_service_decode.h @@ -1,11 +1,11 @@ /* - * Copyright (c) 2024 Nordic Semiconductor ASA + * Copyright (c) 2025 Nordic Semiconductor ASA * * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ /* - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */ diff --git a/subsys/sdfw_services/services/echo/zcbor_generated/echo_service_encode.c b/subsys/sdfw_services/services/echo/zcbor_generated/echo_service_encode.c index a0cf04d2482e..9faf91bc6b9c 100644 --- a/subsys/sdfw_services/services/echo/zcbor_generated/echo_service_encode.c +++ b/subsys/sdfw_services/services/echo/zcbor_generated/echo_service_encode.c @@ -1,11 +1,11 @@ /* - * Copyright (c) 2024 Nordic Semiconductor ASA + * Copyright (c) 2025 Nordic Semiconductor ASA * * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ /* - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */ @@ -22,6 +22,17 @@ #error "The type file was generated with a different default_max_qty than this file" #endif +#define log_result(state, result, func) \ + do { \ + if (!result) { \ + zcbor_trace_file(state); \ + zcbor_log("%s error: %s\r\n", func, \ + zcbor_error_str(zcbor_peek_error(state))); \ + } else { \ + zcbor_log("%s success\r\n", func); \ + } \ + } while (0) + static bool encode_echo_service_rsp(zcbor_state_t *state, const struct echo_service_rsp *input); static bool encode_echo_service_req(zcbor_state_t *state, const struct zcbor_string *input); @@ -29,40 +40,27 @@ static bool encode_echo_service_rsp(zcbor_state_t *state, const struct echo_serv { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((zcbor_list_start_encode(state, 2) && - ((((zcbor_int32_encode(state, (&(*input).echo_service_rsp_ret)))) && - ((zcbor_tstr_encode(state, (&(*input).echo_service_rsp_str_out))))) || - (zcbor_list_map_end_force_encode(state), false)) && - zcbor_list_end_encode(state, 2)))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((zcbor_list_start_encode(state, 2) && + ((((zcbor_int32_encode(state, (&(*input).echo_service_rsp_ret)))) && + ((zcbor_tstr_encode(state, (&(*input).echo_service_rsp_str_out))))) || + (zcbor_list_map_end_force_encode(state), false)) && + zcbor_list_end_encode(state, 2)))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_echo_service_req(zcbor_state_t *state, const struct zcbor_string *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = (((zcbor_list_start_encode(state, 1) && - ((((zcbor_tstr_encode(state, (&(*input)))))) || - (zcbor_list_map_end_force_encode(state), false)) && - zcbor_list_end_encode(state, 1)))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((zcbor_list_start_encode(state, 1) && + ((((zcbor_tstr_encode(state, (&(*input)))))) || + (zcbor_list_map_end_force_encode(state), false)) && + zcbor_list_end_encode(state, 1)))); - return tmp_result; + log_result(state, res, __func__); + return res; } int cbor_encode_echo_service_req(uint8_t *payload, size_t payload_len, diff --git a/subsys/sdfw_services/services/echo/zcbor_generated/echo_service_encode.h b/subsys/sdfw_services/services/echo/zcbor_generated/echo_service_encode.h index 08002595be0e..20a42aee8ffb 100644 --- a/subsys/sdfw_services/services/echo/zcbor_generated/echo_service_encode.h +++ b/subsys/sdfw_services/services/echo/zcbor_generated/echo_service_encode.h @@ -1,11 +1,11 @@ /* - * Copyright (c) 2024 Nordic Semiconductor ASA + * Copyright (c) 2025 Nordic Semiconductor ASA * * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ /* - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */ diff --git a/subsys/sdfw_services/services/echo/zcbor_generated/echo_service_types.h b/subsys/sdfw_services/services/echo/zcbor_generated/echo_service_types.h index 8b89ebb3c067..65f7bfbd249d 100644 --- a/subsys/sdfw_services/services/echo/zcbor_generated/echo_service_types.h +++ b/subsys/sdfw_services/services/echo/zcbor_generated/echo_service_types.h @@ -1,11 +1,11 @@ /* - * Copyright (c) 2024 Nordic Semiconductor ASA + * Copyright (c) 2025 Nordic Semiconductor ASA * * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ /* - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */ diff --git a/subsys/sdfw_services/services/psa_crypto/zcbor_generated/CMakeLists.txt b/subsys/sdfw_services/services/psa_crypto/zcbor_generated/CMakeLists.txt index 474cb6a9151e..0f6f7b692165 100644 --- a/subsys/sdfw_services/services/psa_crypto/zcbor_generated/CMakeLists.txt +++ b/subsys/sdfw_services/services/psa_crypto/zcbor_generated/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2022 Nordic Semiconductor +# Copyright (c) 2025 Nordic Semiconductor ASA # # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # diff --git a/subsys/sdfw_services/services/psa_crypto/zcbor_generated/psa_crypto_service_decode.c b/subsys/sdfw_services/services/psa_crypto/zcbor_generated/psa_crypto_service_decode.c index 7a6b93d67ee9..d6bce2120c32 100644 --- a/subsys/sdfw_services/services/psa_crypto/zcbor_generated/psa_crypto_service_decode.c +++ b/subsys/sdfw_services/services/psa_crypto/zcbor_generated/psa_crypto_service_decode.c @@ -1,11 +1,11 @@ /* - * Copyright (c) 2024 Nordic Semiconductor ASA + * Copyright (c) 2025 Nordic Semiconductor ASA * * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ /* - * Generated using zcbor version 0.8.99 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */ @@ -22,6 +22,17 @@ #error "The type file was generated with a different default_max_qty than this file" #endif +#define log_result(state, result, func) \ + do { \ + if (!result) { \ + zcbor_trace_file(state); \ + zcbor_log("%s error: %s\r\n", func, \ + zcbor_error_str(zcbor_peek_error(state))); \ + } else { \ + zcbor_log("%s success\r\n", func); \ + } \ + } while (0) + static bool decode_ptr_attr(zcbor_state_t *state, uint32_t *result); static bool decode_psa_get_key_attributes_req(zcbor_state_t *state, struct psa_get_key_attributes_req *result); @@ -157,17 +168,10 @@ static bool decode_ptr_attr(zcbor_state_t *state, uint32_t *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - ((zcbor_tag_expect(state, 32772) && (zcbor_uint32_decode(state, (&(*result)))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = ((zcbor_tag_expect(state, 32772) && (zcbor_uint32_decode(state, (&(*result)))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_get_key_attributes_req(zcbor_state_t *state, @@ -175,19 +179,13 @@ static bool decode_psa_get_key_attributes_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = ((( + bool res = ((( ((zcbor_uint32_expect(state, (11)))) && ((zcbor_uint32_decode(state, (&(*result).psa_get_key_attributes_req_key)))) && ((decode_ptr_attr(state, (&(*result).psa_get_key_attributes_req_p_attributes))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_reset_key_attributes_req(zcbor_state_t *state, @@ -195,184 +193,115 @@ static bool decode_psa_reset_key_attributes_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_expect(state, (12)))) && - ((decode_ptr_attr(state, - (&(*result).psa_reset_key_attributes_req_p_attributes))))))); + bool res = (((((zcbor_uint32_expect(state, (12)))) && + ((decode_ptr_attr( + state, (&(*result).psa_reset_key_attributes_req_p_attributes))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_purge_key_req(zcbor_state_t *state, struct psa_purge_key_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = (((((zcbor_uint32_expect(state, (13)))) && - ((zcbor_uint32_decode(state, (&(*result).psa_purge_key_req_key))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_expect(state, (13)))) && + ((zcbor_uint32_decode(state, (&(*result).psa_purge_key_req_key))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_ptr_key(zcbor_state_t *state, uint32_t *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - ((zcbor_tag_expect(state, 32773) && (zcbor_uint32_decode(state, (&(*result)))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = ((zcbor_tag_expect(state, 32773) && (zcbor_uint32_decode(state, (&(*result)))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_copy_key_req(zcbor_state_t *state, struct psa_copy_key_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_expect(state, (14)))) && - ((zcbor_uint32_decode(state, (&(*result).psa_copy_key_req_source_key)))) && - ((decode_ptr_attr(state, (&(*result).psa_copy_key_req_p_attributes)))) && - ((decode_ptr_key(state, (&(*result).psa_copy_key_req_p_target_key))))))); + bool res = (((((zcbor_uint32_expect(state, (14)))) && + ((zcbor_uint32_decode(state, (&(*result).psa_copy_key_req_source_key)))) && + ((decode_ptr_attr(state, (&(*result).psa_copy_key_req_p_attributes)))) && + ((decode_ptr_key(state, (&(*result).psa_copy_key_req_p_target_key))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_destroy_key_req(zcbor_state_t *state, struct psa_destroy_key_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_expect(state, (15)))) && - ((zcbor_uint32_decode(state, (&(*result).psa_destroy_key_req_key))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_expect(state, (15)))) && + ((zcbor_uint32_decode(state, (&(*result).psa_destroy_key_req_key))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_ptr_buf(zcbor_state_t *state, uint32_t *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - ((zcbor_tag_expect(state, 32770) && (zcbor_uint32_decode(state, (&(*result)))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = ((zcbor_tag_expect(state, 32770) && (zcbor_uint32_decode(state, (&(*result)))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_buf_len(zcbor_state_t *state, uint32_t *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - ((zcbor_tag_expect(state, 32771) && (zcbor_uint32_decode(state, (&(*result)))))); + bool res = ((zcbor_tag_expect(state, 32771) && (zcbor_uint32_decode(state, (&(*result)))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_import_key_req(zcbor_state_t *state, struct psa_import_key_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_expect(state, (16)))) && - ((decode_ptr_attr(state, (&(*result).psa_import_key_req_p_attributes)))) && - ((decode_ptr_buf(state, (&(*result).psa_import_key_req_p_data)))) && - ((decode_buf_len(state, (&(*result).psa_import_key_req_data_length)))) && - ((decode_ptr_key(state, (&(*result).psa_import_key_req_p_key))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_expect(state, (16)))) && + ((decode_ptr_attr(state, (&(*result).psa_import_key_req_p_attributes)))) && + ((decode_ptr_buf(state, (&(*result).psa_import_key_req_p_data)))) && + ((decode_buf_len(state, (&(*result).psa_import_key_req_data_length)))) && + ((decode_ptr_key(state, (&(*result).psa_import_key_req_p_key))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_ptr_uint(zcbor_state_t *state, uint32_t *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - ((zcbor_tag_expect(state, 32774) && (zcbor_uint32_decode(state, (&(*result)))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = ((zcbor_tag_expect(state, 32774) && (zcbor_uint32_decode(state, (&(*result)))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_export_key_req(zcbor_state_t *state, struct psa_export_key_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_expect(state, (17)))) && - ((zcbor_uint32_decode(state, (&(*result).psa_export_key_req_key)))) && - ((decode_ptr_buf(state, (&(*result).psa_export_key_req_p_data)))) && - ((decode_buf_len(state, (&(*result).psa_export_key_req_data_size)))) && - ((decode_ptr_uint(state, (&(*result).psa_export_key_req_p_data_length))))))); + bool res = (((((zcbor_uint32_expect(state, (17)))) && + ((zcbor_uint32_decode(state, (&(*result).psa_export_key_req_key)))) && + ((decode_ptr_buf(state, (&(*result).psa_export_key_req_p_data)))) && + ((decode_buf_len(state, (&(*result).psa_export_key_req_data_size)))) && + ((decode_ptr_uint(state, (&(*result).psa_export_key_req_p_data_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_export_public_key_req(zcbor_state_t *state, @@ -380,28 +309,22 @@ static bool decode_psa_export_public_key_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = ((( + bool res = ((( ((zcbor_uint32_expect(state, (18)))) && ((zcbor_uint32_decode(state, (&(*result).psa_export_public_key_req_key)))) && ((decode_ptr_buf(state, (&(*result).psa_export_public_key_req_p_data)))) && ((decode_buf_len(state, (&(*result).psa_export_public_key_req_data_size)))) && ((decode_ptr_uint(state, (&(*result).psa_export_public_key_req_p_data_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_hash_compute_req(zcbor_state_t *state, struct psa_hash_compute_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_expect(state, (19)))) && ((zcbor_uint32_decode(state, (&(*result).psa_hash_compute_req_alg)))) && ((decode_ptr_buf(state, (&(*result).psa_hash_compute_req_p_input)))) && @@ -410,199 +333,131 @@ static bool decode_psa_hash_compute_req(zcbor_state_t *state, struct psa_hash_co ((decode_buf_len(state, (&(*result).psa_hash_compute_req_hash_size)))) && ((decode_ptr_uint(state, (&(*result).psa_hash_compute_req_p_hash_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_hash_compare_req(zcbor_state_t *state, struct psa_hash_compare_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_expect(state, (20)))) && - ((zcbor_uint32_decode(state, (&(*result).psa_hash_compare_req_alg)))) && - ((decode_ptr_buf(state, (&(*result).psa_hash_compare_req_p_input)))) && - ((decode_buf_len(state, (&(*result).psa_hash_compare_req_input_length)))) && - ((decode_ptr_buf(state, (&(*result).psa_hash_compare_req_p_hash)))) && - ((decode_buf_len(state, (&(*result).psa_hash_compare_req_hash_length))))))); + bool res = (((((zcbor_uint32_expect(state, (20)))) && + ((zcbor_uint32_decode(state, (&(*result).psa_hash_compare_req_alg)))) && + ((decode_ptr_buf(state, (&(*result).psa_hash_compare_req_p_input)))) && + ((decode_buf_len(state, (&(*result).psa_hash_compare_req_input_length)))) && + ((decode_ptr_buf(state, (&(*result).psa_hash_compare_req_p_hash)))) && + ((decode_buf_len(state, (&(*result).psa_hash_compare_req_hash_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_hash_setup_req(zcbor_state_t *state, struct psa_hash_setup_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = (((((zcbor_uint32_expect(state, (21)))) && - ((decode_ptr_uint(state, (&(*result).psa_hash_setup_req_p_handle)))) && - ((zcbor_uint32_decode(state, (&(*result).psa_hash_setup_req_alg))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_expect(state, (21)))) && + ((decode_ptr_uint(state, (&(*result).psa_hash_setup_req_p_handle)))) && + ((zcbor_uint32_decode(state, (&(*result).psa_hash_setup_req_alg))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_hash_update_req(zcbor_state_t *state, struct psa_hash_update_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_expect(state, (22)))) && - ((decode_ptr_uint(state, (&(*result).psa_hash_update_req_p_handle)))) && - ((decode_ptr_buf(state, (&(*result).psa_hash_update_req_p_input)))) && - ((decode_buf_len(state, (&(*result).psa_hash_update_req_input_length))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_expect(state, (22)))) && + ((decode_ptr_uint(state, (&(*result).psa_hash_update_req_p_handle)))) && + ((decode_ptr_buf(state, (&(*result).psa_hash_update_req_p_input)))) && + ((decode_buf_len(state, (&(*result).psa_hash_update_req_input_length))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_hash_finish_req(zcbor_state_t *state, struct psa_hash_finish_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_expect(state, (23)))) && - ((decode_ptr_uint(state, (&(*result).psa_hash_finish_req_p_handle)))) && - ((decode_ptr_buf(state, (&(*result).psa_hash_finish_req_p_hash)))) && - ((decode_buf_len(state, (&(*result).psa_hash_finish_req_hash_size)))) && - ((decode_ptr_uint(state, (&(*result).psa_hash_finish_req_p_hash_length))))))); + bool res = (((((zcbor_uint32_expect(state, (23)))) && + ((decode_ptr_uint(state, (&(*result).psa_hash_finish_req_p_handle)))) && + ((decode_ptr_buf(state, (&(*result).psa_hash_finish_req_p_hash)))) && + ((decode_buf_len(state, (&(*result).psa_hash_finish_req_hash_size)))) && + ((decode_ptr_uint(state, (&(*result).psa_hash_finish_req_p_hash_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_hash_verify_req(zcbor_state_t *state, struct psa_hash_verify_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_expect(state, (24)))) && - ((decode_ptr_uint(state, (&(*result).psa_hash_verify_req_p_handle)))) && - ((decode_ptr_buf(state, (&(*result).psa_hash_verify_req_p_hash)))) && - ((decode_buf_len(state, (&(*result).psa_hash_verify_req_hash_length))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_expect(state, (24)))) && + ((decode_ptr_uint(state, (&(*result).psa_hash_verify_req_p_handle)))) && + ((decode_ptr_buf(state, (&(*result).psa_hash_verify_req_p_hash)))) && + ((decode_buf_len(state, (&(*result).psa_hash_verify_req_hash_length))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_hash_abort_req(zcbor_state_t *state, struct psa_hash_abort_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_expect(state, (25)))) && - ((decode_ptr_uint(state, (&(*result).psa_hash_abort_req_p_handle))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_expect(state, (25)))) && + ((decode_ptr_uint(state, (&(*result).psa_hash_abort_req_p_handle))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_hash_clone_req(zcbor_state_t *state, struct psa_hash_clone_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_expect(state, (26)))) && - ((zcbor_uint32_decode(state, (&(*result).psa_hash_clone_req_handle)))) && - ((decode_ptr_uint(state, (&(*result).psa_hash_clone_req_p_handle))))))); + bool res = (((((zcbor_uint32_expect(state, (26)))) && + ((zcbor_uint32_decode(state, (&(*result).psa_hash_clone_req_handle)))) && + ((decode_ptr_uint(state, (&(*result).psa_hash_clone_req_p_handle))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_mac_compute_req(zcbor_state_t *state, struct psa_mac_compute_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_expect(state, (27)))) && - ((zcbor_uint32_decode(state, (&(*result).psa_mac_compute_req_key)))) && - ((zcbor_uint32_decode(state, (&(*result).psa_mac_compute_req_alg)))) && - ((decode_ptr_buf(state, (&(*result).psa_mac_compute_req_p_input)))) && - ((decode_buf_len(state, (&(*result).psa_mac_compute_req_input_length)))) && - ((decode_ptr_buf(state, (&(*result).psa_mac_compute_req_p_mac)))) && - ((decode_buf_len(state, (&(*result).psa_mac_compute_req_mac_size)))) && - ((decode_ptr_uint(state, (&(*result).psa_mac_compute_req_p_mac_length))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_expect(state, (27)))) && + ((zcbor_uint32_decode(state, (&(*result).psa_mac_compute_req_key)))) && + ((zcbor_uint32_decode(state, (&(*result).psa_mac_compute_req_alg)))) && + ((decode_ptr_buf(state, (&(*result).psa_mac_compute_req_p_input)))) && + ((decode_buf_len(state, (&(*result).psa_mac_compute_req_input_length)))) && + ((decode_ptr_buf(state, (&(*result).psa_mac_compute_req_p_mac)))) && + ((decode_buf_len(state, (&(*result).psa_mac_compute_req_mac_size)))) && + ((decode_ptr_uint(state, (&(*result).psa_mac_compute_req_p_mac_length))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_mac_verify_req(zcbor_state_t *state, struct psa_mac_verify_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_expect(state, (28)))) && - ((zcbor_uint32_decode(state, (&(*result).psa_mac_verify_req_key)))) && - ((zcbor_uint32_decode(state, (&(*result).psa_mac_verify_req_alg)))) && - ((decode_ptr_buf(state, (&(*result).psa_mac_verify_req_p_input)))) && - ((decode_buf_len(state, (&(*result).psa_mac_verify_req_input_length)))) && - ((decode_ptr_buf(state, (&(*result).psa_mac_verify_req_p_mac)))) && - ((decode_buf_len(state, (&(*result).psa_mac_verify_req_mac_length))))))); + bool res = (((((zcbor_uint32_expect(state, (28)))) && + ((zcbor_uint32_decode(state, (&(*result).psa_mac_verify_req_key)))) && + ((zcbor_uint32_decode(state, (&(*result).psa_mac_verify_req_alg)))) && + ((decode_ptr_buf(state, (&(*result).psa_mac_verify_req_p_input)))) && + ((decode_buf_len(state, (&(*result).psa_mac_verify_req_input_length)))) && + ((decode_ptr_buf(state, (&(*result).psa_mac_verify_req_p_mac)))) && + ((decode_buf_len(state, (&(*result).psa_mac_verify_req_mac_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_mac_sign_setup_req(zcbor_state_t *state, @@ -610,20 +465,13 @@ static bool decode_psa_mac_sign_setup_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_expect(state, (29)))) && - ((decode_ptr_uint(state, (&(*result).psa_mac_sign_setup_req_p_handle)))) && - ((zcbor_uint32_decode(state, (&(*result).psa_mac_sign_setup_req_key)))) && - ((zcbor_uint32_decode(state, (&(*result).psa_mac_sign_setup_req_alg))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_expect(state, (29)))) && + ((decode_ptr_uint(state, (&(*result).psa_mac_sign_setup_req_p_handle)))) && + ((zcbor_uint32_decode(state, (&(*result).psa_mac_sign_setup_req_key)))) && + ((zcbor_uint32_decode(state, (&(*result).psa_mac_sign_setup_req_alg))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_mac_verify_setup_req(zcbor_state_t *state, @@ -631,40 +479,26 @@ static bool decode_psa_mac_verify_setup_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_expect(state, (30)))) && - ((decode_ptr_uint(state, (&(*result).psa_mac_verify_setup_req_p_handle)))) && - ((zcbor_uint32_decode(state, (&(*result).psa_mac_verify_setup_req_key)))) && - ((zcbor_uint32_decode(state, (&(*result).psa_mac_verify_setup_req_alg))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_expect(state, (30)))) && + ((decode_ptr_uint(state, (&(*result).psa_mac_verify_setup_req_p_handle)))) && + ((zcbor_uint32_decode(state, (&(*result).psa_mac_verify_setup_req_key)))) && + ((zcbor_uint32_decode(state, (&(*result).psa_mac_verify_setup_req_alg))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_mac_update_req(zcbor_state_t *state, struct psa_mac_update_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_expect(state, (31)))) && - ((decode_ptr_uint(state, (&(*result).psa_mac_update_req_p_handle)))) && - ((decode_ptr_buf(state, (&(*result).psa_mac_update_req_p_input)))) && - ((decode_buf_len(state, (&(*result).psa_mac_update_req_input_length))))))); + bool res = (((((zcbor_uint32_expect(state, (31)))) && + ((decode_ptr_uint(state, (&(*result).psa_mac_update_req_p_handle)))) && + ((decode_ptr_buf(state, (&(*result).psa_mac_update_req_p_input)))) && + ((decode_buf_len(state, (&(*result).psa_mac_update_req_input_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_mac_sign_finish_req(zcbor_state_t *state, @@ -672,21 +506,15 @@ static bool decode_psa_mac_sign_finish_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_expect(state, (32)))) && ((decode_ptr_uint(state, (&(*result).psa_mac_sign_finish_req_p_handle)))) && ((decode_ptr_buf(state, (&(*result).psa_mac_sign_finish_req_p_mac)))) && ((decode_buf_len(state, (&(*result).psa_mac_sign_finish_req_mac_size)))) && ((decode_ptr_uint(state, (&(*result).psa_mac_sign_finish_req_p_mac_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_mac_verify_finish_req(zcbor_state_t *state, @@ -694,37 +522,25 @@ static bool decode_psa_mac_verify_finish_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_expect(state, (33)))) && ((decode_ptr_uint(state, (&(*result).psa_mac_verify_finish_req_p_handle)))) && ((decode_ptr_buf(state, (&(*result).psa_mac_verify_finish_req_p_mac)))) && ((decode_buf_len(state, (&(*result).psa_mac_verify_finish_req_mac_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_mac_abort_req(zcbor_state_t *state, struct psa_mac_abort_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = (((((zcbor_uint32_expect(state, (34)))) && - ((decode_ptr_uint(state, (&(*result).psa_mac_abort_req_p_handle))))))); + bool res = (((((zcbor_uint32_expect(state, (34)))) && + ((decode_ptr_uint(state, (&(*result).psa_mac_abort_req_p_handle))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_cipher_encrypt_req(zcbor_state_t *state, @@ -732,7 +548,7 @@ static bool decode_psa_cipher_encrypt_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = (( + bool res = (( (((zcbor_uint32_expect(state, (35)))) && ((zcbor_uint32_decode(state, (&(*result).psa_cipher_encrypt_req_key)))) && ((zcbor_uint32_decode(state, (&(*result).psa_cipher_encrypt_req_alg)))) && @@ -742,14 +558,8 @@ static bool decode_psa_cipher_encrypt_req(zcbor_state_t *state, ((decode_buf_len(state, (&(*result).psa_cipher_encrypt_req_output_size)))) && ((decode_ptr_uint(state, (&(*result).psa_cipher_encrypt_req_p_output_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_cipher_decrypt_req(zcbor_state_t *state, @@ -757,7 +567,7 @@ static bool decode_psa_cipher_decrypt_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = (( + bool res = (( (((zcbor_uint32_expect(state, (36)))) && ((zcbor_uint32_decode(state, (&(*result).psa_cipher_decrypt_req_key)))) && ((zcbor_uint32_decode(state, (&(*result).psa_cipher_decrypt_req_alg)))) && @@ -767,14 +577,8 @@ static bool decode_psa_cipher_decrypt_req(zcbor_state_t *state, ((decode_buf_len(state, (&(*result).psa_cipher_decrypt_req_output_size)))) && ((decode_ptr_uint(state, (&(*result).psa_cipher_decrypt_req_p_output_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_cipher_encrypt_setup_req(zcbor_state_t *state, @@ -782,20 +586,14 @@ static bool decode_psa_cipher_encrypt_setup_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_expect(state, (37)))) && ((decode_ptr_uint(state, (&(*result).psa_cipher_encrypt_setup_req_p_handle)))) && ((zcbor_uint32_decode(state, (&(*result).psa_cipher_encrypt_setup_req_key)))) && ((zcbor_uint32_decode(state, (&(*result).psa_cipher_encrypt_setup_req_alg))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_cipher_decrypt_setup_req(zcbor_state_t *state, @@ -803,20 +601,14 @@ static bool decode_psa_cipher_decrypt_setup_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_expect(state, (38)))) && ((decode_ptr_uint(state, (&(*result).psa_cipher_decrypt_setup_req_p_handle)))) && ((zcbor_uint32_decode(state, (&(*result).psa_cipher_decrypt_setup_req_key)))) && ((zcbor_uint32_decode(state, (&(*result).psa_cipher_decrypt_setup_req_alg))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_cipher_generate_iv_req(zcbor_state_t *state, @@ -824,48 +616,35 @@ static bool decode_psa_cipher_generate_iv_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = (( + bool res = (( (((zcbor_uint32_expect(state, (39)))) && ((decode_ptr_uint(state, (&(*result).psa_cipher_generate_iv_req_p_handle)))) && ((decode_ptr_buf(state, (&(*result).psa_cipher_generate_iv_req_p_iv)))) && ((decode_buf_len(state, (&(*result).psa_cipher_generate_iv_req_iv_size)))) && ((decode_ptr_uint(state, (&(*result).psa_cipher_generate_iv_req_p_iv_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_cipher_set_iv_req(zcbor_state_t *state, struct psa_cipher_set_iv_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_expect(state, (40)))) && - ((decode_ptr_uint(state, (&(*result).psa_cipher_set_iv_req_p_handle)))) && - ((decode_ptr_buf(state, (&(*result).psa_cipher_set_iv_req_p_iv)))) && - ((decode_buf_len(state, (&(*result).psa_cipher_set_iv_req_iv_length))))))); + bool res = (((((zcbor_uint32_expect(state, (40)))) && + ((decode_ptr_uint(state, (&(*result).psa_cipher_set_iv_req_p_handle)))) && + ((decode_ptr_buf(state, (&(*result).psa_cipher_set_iv_req_p_iv)))) && + ((decode_buf_len(state, (&(*result).psa_cipher_set_iv_req_iv_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_cipher_update_req(zcbor_state_t *state, struct psa_cipher_update_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = (( + bool res = (( (((zcbor_uint32_expect(state, (41)))) && ((decode_ptr_uint(state, (&(*result).psa_cipher_update_req_p_handle)))) && ((decode_ptr_buf(state, (&(*result).psa_cipher_update_req_p_input)))) && @@ -874,60 +653,41 @@ static bool decode_psa_cipher_update_req(zcbor_state_t *state, struct psa_cipher ((decode_buf_len(state, (&(*result).psa_cipher_update_req_output_size)))) && ((decode_ptr_uint(state, (&(*result).psa_cipher_update_req_p_output_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_cipher_finish_req(zcbor_state_t *state, struct psa_cipher_finish_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = (( + bool res = (( (((zcbor_uint32_expect(state, (42)))) && ((decode_ptr_uint(state, (&(*result).psa_cipher_finish_req_p_handle)))) && ((decode_ptr_buf(state, (&(*result).psa_cipher_finish_req_p_output)))) && ((decode_buf_len(state, (&(*result).psa_cipher_finish_req_output_size)))) && ((decode_ptr_uint(state, (&(*result).psa_cipher_finish_req_p_output_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_cipher_abort_req(zcbor_state_t *state, struct psa_cipher_abort_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_expect(state, (43)))) && - ((decode_ptr_uint(state, (&(*result).psa_cipher_abort_req_p_handle))))))); + bool res = (((((zcbor_uint32_expect(state, (43)))) && + ((decode_ptr_uint(state, (&(*result).psa_cipher_abort_req_p_handle))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_aead_encrypt_req(zcbor_state_t *state, struct psa_aead_encrypt_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_expect(state, (44)))) && ((zcbor_uint32_decode(state, (&(*result).psa_aead_encrypt_req_key)))) && ((zcbor_uint32_decode(state, (&(*result).psa_aead_encrypt_req_alg)))) && @@ -943,21 +703,15 @@ static bool decode_psa_aead_encrypt_req(zcbor_state_t *state, struct psa_aead_en ((decode_ptr_uint(state, (&(*result).psa_aead_encrypt_req_p_ciphertext_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_aead_decrypt_req(zcbor_state_t *state, struct psa_aead_decrypt_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = ((( + bool res = ((( ((zcbor_uint32_expect(state, (45)))) && ((zcbor_uint32_decode(state, (&(*result).psa_aead_decrypt_req_key)))) && ((zcbor_uint32_decode(state, (&(*result).psa_aead_decrypt_req_alg)))) && @@ -972,14 +726,8 @@ static bool decode_psa_aead_decrypt_req(zcbor_state_t *state, struct psa_aead_de ((decode_buf_len(state, (&(*result).psa_aead_decrypt_req_plaintext_size)))) && ((decode_ptr_uint(state, (&(*result).psa_aead_decrypt_req_p_plaintext_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_aead_encrypt_setup_req(zcbor_state_t *state, @@ -987,20 +735,14 @@ static bool decode_psa_aead_encrypt_setup_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_expect(state, (46)))) && ((decode_ptr_uint(state, (&(*result).psa_aead_encrypt_setup_req_p_handle)))) && ((zcbor_uint32_decode(state, (&(*result).psa_aead_encrypt_setup_req_key)))) && ((zcbor_uint32_decode(state, (&(*result).psa_aead_encrypt_setup_req_alg))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_aead_decrypt_setup_req(zcbor_state_t *state, @@ -1008,20 +750,14 @@ static bool decode_psa_aead_decrypt_setup_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_expect(state, (47)))) && ((decode_ptr_uint(state, (&(*result).psa_aead_decrypt_setup_req_p_handle)))) && ((zcbor_uint32_decode(state, (&(*result).psa_aead_decrypt_setup_req_key)))) && ((zcbor_uint32_decode(state, (&(*result).psa_aead_decrypt_setup_req_alg))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_aead_generate_nonce_req(zcbor_state_t *state, @@ -1029,7 +765,7 @@ static bool decode_psa_aead_generate_nonce_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_expect(state, (48)))) && ((decode_ptr_uint(state, (&(*result).psa_aead_generate_nonce_req_p_handle)))) && ((decode_ptr_buf(state, (&(*result).psa_aead_generate_nonce_req_p_nonce)))) && @@ -1037,14 +773,8 @@ static bool decode_psa_aead_generate_nonce_req(zcbor_state_t *state, ((decode_ptr_uint(state, (&(*result).psa_aead_generate_nonce_req_p_nonce_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_aead_set_nonce_req(zcbor_state_t *state, @@ -1052,20 +782,14 @@ static bool decode_psa_aead_set_nonce_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_expect(state, (49)))) && ((decode_ptr_uint(state, (&(*result).psa_aead_set_nonce_req_p_handle)))) && ((decode_ptr_buf(state, (&(*result).psa_aead_set_nonce_req_p_nonce)))) && ((decode_buf_len(state, (&(*result).psa_aead_set_nonce_req_nonce_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_aead_set_lengths_req(zcbor_state_t *state, @@ -1073,21 +797,14 @@ static bool decode_psa_aead_set_lengths_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_expect(state, (50)))) && - ((decode_ptr_uint(state, (&(*result).psa_aead_set_lengths_req_p_handle)))) && - ((decode_buf_len(state, (&(*result).psa_aead_set_lengths_req_ad_length)))) && - ((decode_buf_len(state, - (&(*result).psa_aead_set_lengths_req_plaintext_length))))))); + bool res = (((((zcbor_uint32_expect(state, (50)))) && + ((decode_ptr_uint(state, (&(*result).psa_aead_set_lengths_req_p_handle)))) && + ((decode_buf_len(state, (&(*result).psa_aead_set_lengths_req_ad_length)))) && + ((decode_buf_len(state, + (&(*result).psa_aead_set_lengths_req_plaintext_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_aead_update_ad_req(zcbor_state_t *state, @@ -1095,27 +812,21 @@ static bool decode_psa_aead_update_ad_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_expect(state, (51)))) && ((decode_ptr_uint(state, (&(*result).psa_aead_update_ad_req_p_handle)))) && ((decode_ptr_buf(state, (&(*result).psa_aead_update_ad_req_p_input)))) && ((decode_buf_len(state, (&(*result).psa_aead_update_ad_req_input_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_aead_update_req(zcbor_state_t *state, struct psa_aead_update_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_expect(state, (52)))) && ((decode_ptr_uint(state, (&(*result).psa_aead_update_req_p_handle)))) && ((decode_ptr_buf(state, (&(*result).psa_aead_update_req_p_input)))) && @@ -1124,21 +835,15 @@ static bool decode_psa_aead_update_req(zcbor_state_t *state, struct psa_aead_upd ((decode_buf_len(state, (&(*result).psa_aead_update_req_output_size)))) && ((decode_ptr_uint(state, (&(*result).psa_aead_update_req_p_output_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_aead_finish_req(zcbor_state_t *state, struct psa_aead_finish_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = (( + bool res = (( (((zcbor_uint32_expect(state, (53)))) && ((decode_ptr_uint(state, (&(*result).psa_aead_finish_req_p_handle)))) && ((decode_ptr_buf(state, (&(*result).psa_aead_finish_req_p_ciphertext)))) && @@ -1148,21 +853,15 @@ static bool decode_psa_aead_finish_req(zcbor_state_t *state, struct psa_aead_fin ((decode_buf_len(state, (&(*result).psa_aead_finish_req_tag_size)))) && ((decode_ptr_uint(state, (&(*result).psa_aead_finish_req_p_tag_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_aead_verify_req(zcbor_state_t *state, struct psa_aead_verify_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = (( + bool res = (( (((zcbor_uint32_expect(state, (54)))) && ((decode_ptr_uint(state, (&(*result).psa_aead_verify_req_p_handle)))) && ((decode_ptr_buf(state, (&(*result).psa_aead_verify_req_p_plaintext)))) && @@ -1171,39 +870,26 @@ static bool decode_psa_aead_verify_req(zcbor_state_t *state, struct psa_aead_ver ((decode_ptr_buf(state, (&(*result).psa_aead_verify_req_p_tag)))) && ((decode_buf_len(state, (&(*result).psa_aead_verify_req_tag_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_aead_abort_req(zcbor_state_t *state, struct psa_aead_abort_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_expect(state, (55)))) && - ((decode_ptr_uint(state, (&(*result).psa_aead_abort_req_p_handle))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_expect(state, (55)))) && + ((decode_ptr_uint(state, (&(*result).psa_aead_abort_req_p_handle))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_sign_message_req(zcbor_state_t *state, struct psa_sign_message_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = ((( + bool res = ((( ((zcbor_uint32_expect(state, (56)))) && ((zcbor_uint32_decode(state, (&(*result).psa_sign_message_req_key)))) && ((zcbor_uint32_decode(state, (&(*result).psa_sign_message_req_alg)))) && @@ -1213,14 +899,8 @@ static bool decode_psa_sign_message_req(zcbor_state_t *state, struct psa_sign_me ((decode_buf_len(state, (&(*result).psa_sign_message_req_signature_size)))) && ((decode_ptr_uint(state, (&(*result).psa_sign_message_req_p_signature_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_verify_message_req(zcbor_state_t *state, @@ -1228,7 +908,7 @@ static bool decode_psa_verify_message_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = (( + bool res = (( (((zcbor_uint32_expect(state, (57)))) && ((zcbor_uint32_decode(state, (&(*result).psa_verify_message_req_key)))) && ((zcbor_uint32_decode(state, (&(*result).psa_verify_message_req_alg)))) && @@ -1237,21 +917,15 @@ static bool decode_psa_verify_message_req(zcbor_state_t *state, ((decode_ptr_buf(state, (&(*result).psa_verify_message_req_p_signature)))) && ((decode_buf_len(state, (&(*result).psa_verify_message_req_signature_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_sign_hash_req(zcbor_state_t *state, struct psa_sign_hash_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_expect(state, (58)))) && ((zcbor_uint32_decode(state, (&(*result).psa_sign_hash_req_key)))) && ((zcbor_uint32_decode(state, (&(*result).psa_sign_hash_req_alg)))) && @@ -1261,21 +935,15 @@ static bool decode_psa_sign_hash_req(zcbor_state_t *state, struct psa_sign_hash_ ((decode_buf_len(state, (&(*result).psa_sign_hash_req_signature_size)))) && ((decode_ptr_uint(state, (&(*result).psa_sign_hash_req_p_signature_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_verify_hash_req(zcbor_state_t *state, struct psa_verify_hash_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_expect(state, (59)))) && ((zcbor_uint32_decode(state, (&(*result).psa_verify_hash_req_key)))) && ((zcbor_uint32_decode(state, (&(*result).psa_verify_hash_req_alg)))) && @@ -1284,14 +952,8 @@ static bool decode_psa_verify_hash_req(zcbor_state_t *state, struct psa_verify_h ((decode_ptr_buf(state, (&(*result).psa_verify_hash_req_p_signature)))) && ((decode_buf_len(state, (&(*result).psa_verify_hash_req_signature_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_asymmetric_encrypt_req(zcbor_state_t *state, @@ -1299,7 +961,7 @@ static bool decode_psa_asymmetric_encrypt_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = (( + bool res = (( (((zcbor_uint32_expect(state, (60)))) && ((zcbor_uint32_decode(state, (&(*result).psa_asymmetric_encrypt_req_key)))) && ((zcbor_uint32_decode(state, (&(*result).psa_asymmetric_encrypt_req_alg)))) && @@ -1312,14 +974,8 @@ static bool decode_psa_asymmetric_encrypt_req(zcbor_state_t *state, ((decode_ptr_uint(state, (&(*result).psa_asymmetric_encrypt_req_p_output_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_asymmetric_decrypt_req(zcbor_state_t *state, @@ -1327,7 +983,7 @@ static bool decode_psa_asymmetric_decrypt_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = (( + bool res = (( (((zcbor_uint32_expect(state, (61)))) && ((zcbor_uint32_decode(state, (&(*result).psa_asymmetric_decrypt_req_key)))) && ((zcbor_uint32_decode(state, (&(*result).psa_asymmetric_decrypt_req_alg)))) && @@ -1340,14 +996,8 @@ static bool decode_psa_asymmetric_decrypt_req(zcbor_state_t *state, ((decode_ptr_uint(state, (&(*result).psa_asymmetric_decrypt_req_p_output_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_key_derivation_setup_req(zcbor_state_t *state, @@ -1355,19 +1005,13 @@ static bool decode_psa_key_derivation_setup_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_expect(state, (62)))) && ((decode_ptr_uint(state, (&(*result).psa_key_derivation_setup_req_p_handle)))) && ((zcbor_uint32_decode(state, (&(*result).psa_key_derivation_setup_req_alg))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool @@ -1376,21 +1020,15 @@ decode_psa_key_derivation_get_capacity_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_expect(state, (63)))) && ((zcbor_uint32_decode( state, (&(*result).psa_key_derivation_get_capacity_req_handle)))) && ((decode_ptr_uint( state, (&(*result).psa_key_derivation_get_capacity_req_p_capacity))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool @@ -1399,21 +1037,15 @@ decode_psa_key_derivation_set_capacity_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_expect(state, (64)))) && ((decode_ptr_uint(state, (&(*result).psa_key_derivation_set_capacity_req_p_handle)))) && ((zcbor_uint32_decode( state, (&(*result).psa_key_derivation_set_capacity_req_capacity))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool @@ -1422,7 +1054,7 @@ decode_psa_key_derivation_input_bytes_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = ((( + bool res = ((( ((zcbor_uint32_expect(state, (65)))) && ((decode_ptr_uint(state, (&(*result).psa_key_derivation_input_bytes_req_p_handle)))) && @@ -1432,14 +1064,8 @@ decode_psa_key_derivation_input_bytes_req(zcbor_state_t *state, ((decode_buf_len(state, (&(*result).psa_key_derivation_input_bytes_req_data_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool @@ -1448,7 +1074,7 @@ decode_psa_key_derivation_input_integer_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_expect(state, (66)))) && ((decode_ptr_uint( state, (&(*result).psa_key_derivation_input_integer_req_p_handle)))) && @@ -1457,14 +1083,8 @@ decode_psa_key_derivation_input_integer_req(zcbor_state_t *state, ((zcbor_uint32_decode( state, (&(*result).psa_key_derivation_input_integer_req_value))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_key_derivation_input_key_req(zcbor_state_t *state, @@ -1472,23 +1092,16 @@ static bool decode_psa_key_derivation_input_key_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_expect(state, (67)))) && - ((decode_ptr_uint(state, - (&(*result).psa_key_derivation_input_key_req_p_handle)))) && - ((zcbor_uint32_decode(state, - (&(*result).psa_key_derivation_input_key_req_step)))) && - ((zcbor_uint32_decode(state, - (&(*result).psa_key_derivation_input_key_req_key))))))); + bool res = (((((zcbor_uint32_expect(state, (67)))) && + ((decode_ptr_uint(state, + (&(*result).psa_key_derivation_input_key_req_p_handle)))) && + ((zcbor_uint32_decode(state, + (&(*result).psa_key_derivation_input_key_req_step)))) && + ((zcbor_uint32_decode(state, + (&(*result).psa_key_derivation_input_key_req_key))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool @@ -1497,7 +1110,7 @@ decode_psa_key_derivation_key_agreement_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = (( + bool res = (( (((zcbor_uint32_expect(state, (68)))) && ((decode_ptr_uint(state, (&(*result).psa_key_derivation_key_agreement_req_p_handle)))) && @@ -1511,14 +1124,8 @@ decode_psa_key_derivation_key_agreement_req(zcbor_state_t *state, state, (&(*result).psa_key_derivation_key_agreement_req_peer_key_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool @@ -1527,7 +1134,7 @@ decode_psa_key_derivation_output_bytes_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = ((( + bool res = ((( ((zcbor_uint32_expect(state, (69)))) && ((decode_ptr_uint(state, (&(*result).psa_key_derivation_output_bytes_req_p_handle)))) && @@ -1536,14 +1143,8 @@ decode_psa_key_derivation_output_bytes_req(zcbor_state_t *state, ((decode_buf_len( state, (&(*result).psa_key_derivation_output_bytes_req_output_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool @@ -1552,7 +1153,7 @@ decode_psa_key_derivation_output_key_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = (( + bool res = (( (((zcbor_uint32_expect(state, (70)))) && ((decode_ptr_attr(state, (&(*result).psa_key_derivation_output_key_req_p_attributes)))) && @@ -1560,14 +1161,8 @@ decode_psa_key_derivation_output_key_req(zcbor_state_t *state, (&(*result).psa_key_derivation_output_key_req_p_handle)))) && ((decode_ptr_key(state, (&(*result).psa_key_derivation_output_key_req_p_key))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_key_derivation_abort_req(zcbor_state_t *state, @@ -1575,18 +1170,12 @@ static bool decode_psa_key_derivation_abort_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = (( + bool res = (( (((zcbor_uint32_expect(state, (71)))) && ((decode_ptr_uint(state, (&(*result).psa_key_derivation_abort_req_p_handle))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_raw_key_agreement_req(zcbor_state_t *state, @@ -1594,7 +1183,7 @@ static bool decode_psa_raw_key_agreement_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = ((( + bool res = ((( ((zcbor_uint32_expect(state, (72)))) && ((zcbor_uint32_decode(state, (&(*result).psa_raw_key_agreement_req_alg)))) && ((zcbor_uint32_decode(state, @@ -1606,14 +1195,8 @@ static bool decode_psa_raw_key_agreement_req(zcbor_state_t *state, ((decode_ptr_uint(state, (&(*result).psa_raw_key_agreement_req_p_output_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_generate_random_req(zcbor_state_t *state, @@ -1621,134 +1204,87 @@ static bool decode_psa_generate_random_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_expect(state, (73)))) && ((decode_ptr_buf(state, (&(*result).psa_generate_random_req_p_output)))) && ((decode_buf_len(state, (&(*result).psa_generate_random_req_output_size))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_generate_key_req(zcbor_state_t *state, struct psa_generate_key_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_expect(state, (74)))) && - ((decode_ptr_attr(state, (&(*result).psa_generate_key_req_p_attributes)))) && - ((decode_ptr_key(state, (&(*result).psa_generate_key_req_p_key))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_expect(state, (74)))) && + ((decode_ptr_attr(state, (&(*result).psa_generate_key_req_p_attributes)))) && + ((decode_ptr_key(state, (&(*result).psa_generate_key_req_p_key))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_ptr_cipher(zcbor_state_t *state, uint32_t *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - ((zcbor_tag_expect(state, 32775) && (zcbor_uint32_decode(state, (&(*result)))))); + bool res = ((zcbor_tag_expect(state, 32775) && (zcbor_uint32_decode(state, (&(*result)))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_pake_setup_req(zcbor_state_t *state, struct psa_pake_setup_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_expect(state, (79)))) && ((decode_ptr_uint(state, (&(*result).psa_pake_setup_req_p_handle)))) && ((zcbor_uint32_decode(state, (&(*result).psa_pake_setup_req_password_key)))) && ((decode_ptr_cipher(state, (&(*result).psa_pake_setup_req_p_cipher_suite))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_pake_set_role_req(zcbor_state_t *state, struct psa_pake_set_role_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_expect(state, (80)))) && - ((decode_ptr_uint(state, (&(*result).psa_pake_set_role_req_p_handle)))) && - ((zcbor_uint32_decode(state, (&(*result).psa_pake_set_role_req_role))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_expect(state, (80)))) && + ((decode_ptr_uint(state, (&(*result).psa_pake_set_role_req_p_handle)))) && + ((zcbor_uint32_decode(state, (&(*result).psa_pake_set_role_req_role))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_pake_set_user_req(zcbor_state_t *state, struct psa_pake_set_user_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_expect(state, (81)))) && - ((decode_ptr_uint(state, (&(*result).psa_pake_set_user_req_p_handle)))) && - ((decode_ptr_buf(state, (&(*result).psa_pake_set_user_req_p_user_id)))) && - ((decode_buf_len(state, (&(*result).psa_pake_set_user_req_user_id_len))))))); + bool res = (((((zcbor_uint32_expect(state, (81)))) && + ((decode_ptr_uint(state, (&(*result).psa_pake_set_user_req_p_handle)))) && + ((decode_ptr_buf(state, (&(*result).psa_pake_set_user_req_p_user_id)))) && + ((decode_buf_len(state, (&(*result).psa_pake_set_user_req_user_id_len))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_pake_set_peer_req(zcbor_state_t *state, struct psa_pake_set_peer_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_expect(state, (82)))) && - ((decode_ptr_uint(state, (&(*result).psa_pake_set_peer_req_p_handle)))) && - ((decode_ptr_buf(state, (&(*result).psa_pake_set_peer_req_p_peer_id)))) && - ((decode_buf_len(state, (&(*result).psa_pake_set_peer_req_peer_id_len))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_expect(state, (82)))) && + ((decode_ptr_uint(state, (&(*result).psa_pake_set_peer_req_p_handle)))) && + ((decode_ptr_buf(state, (&(*result).psa_pake_set_peer_req_p_peer_id)))) && + ((decode_buf_len(state, (&(*result).psa_pake_set_peer_req_peer_id_len))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_pake_set_context_req(zcbor_state_t *state, @@ -1756,27 +1292,21 @@ static bool decode_psa_pake_set_context_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_expect(state, (83)))) && ((decode_ptr_uint(state, (&(*result).psa_pake_set_context_req_p_handle)))) && ((decode_ptr_buf(state, (&(*result).psa_pake_set_context_req_p_context)))) && ((decode_buf_len(state, (&(*result).psa_pake_set_context_req_context_len))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_pake_output_req(zcbor_state_t *state, struct psa_pake_output_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_expect(state, (84)))) && ((decode_ptr_uint(state, (&(*result).psa_pake_output_req_p_handle)))) && ((zcbor_uint32_decode(state, (&(*result).psa_pake_output_req_step)))) && @@ -1784,35 +1314,22 @@ static bool decode_psa_pake_output_req(zcbor_state_t *state, struct psa_pake_out ((decode_buf_len(state, (&(*result).psa_pake_output_req_output_size)))) && ((decode_ptr_uint(state, (&(*result).psa_pake_output_req_p_output_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_pake_input_req(zcbor_state_t *state, struct psa_pake_input_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_expect(state, (85)))) && - ((decode_ptr_uint(state, (&(*result).psa_pake_input_req_p_handle)))) && - ((zcbor_uint32_decode(state, (&(*result).psa_pake_input_req_step)))) && - ((decode_ptr_buf(state, (&(*result).psa_pake_input_req_p_input)))) && - ((decode_buf_len(state, (&(*result).psa_pake_input_req_input_length))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_expect(state, (85)))) && + ((decode_ptr_uint(state, (&(*result).psa_pake_input_req_p_handle)))) && + ((zcbor_uint32_decode(state, (&(*result).psa_pake_input_req_step)))) && + ((decode_ptr_buf(state, (&(*result).psa_pake_input_req_p_input)))) && + ((decode_buf_len(state, (&(*result).psa_pake_input_req_input_length))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_pake_get_shared_key_req(zcbor_state_t *state, @@ -1820,58 +1337,39 @@ static bool decode_psa_pake_get_shared_key_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = ((( + bool res = ((( ((zcbor_uint32_expect(state, (86)))) && ((decode_ptr_uint(state, (&(*result).psa_pake_get_shared_key_req_p_handle)))) && ((decode_ptr_attr(state, (&(*result).psa_pake_get_shared_key_req_p_attributes)))) && ((decode_ptr_key(state, (&(*result).psa_pake_get_shared_key_req_p_key))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_pake_abort_req(zcbor_state_t *state, struct psa_pake_abort_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_expect(state, (87)))) && - ((decode_ptr_uint(state, (&(*result).psa_pake_abort_req_p_handle))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_expect(state, (87)))) && + ((decode_ptr_uint(state, (&(*result).psa_pake_abort_req_p_handle))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_crypto_rsp(zcbor_state_t *state, struct psa_crypto_rsp *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = (((zcbor_list_start_decode(state) && - ((((zcbor_uint32_decode(state, (&(*result).psa_crypto_rsp_id)))) && - ((zcbor_int32_decode(state, (&(*result).psa_crypto_rsp_status))))) || - (zcbor_list_map_end_force_decode(state), false)) && - zcbor_list_end_decode(state)))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((zcbor_list_start_decode(state) && + ((((zcbor_uint32_decode(state, (&(*result).psa_crypto_rsp_id)))) && + ((zcbor_int32_decode(state, (&(*result).psa_crypto_rsp_status))))) || + (zcbor_list_map_end_force_decode(state), false)) && + zcbor_list_end_decode(state)))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_psa_crypto_req(zcbor_state_t *state, struct psa_crypto_req *result) @@ -1879,7 +1377,7 @@ static bool decode_psa_crypto_req(zcbor_state_t *state, struct psa_crypto_req *r zcbor_log("%s\r\n", __func__); bool int_res; - bool tmp_result = ((( + bool res = ((( zcbor_list_start_decode(state) && ((((zcbor_union_start_code(state) && (int_res = @@ -1887,14 +1385,13 @@ static bool decode_psa_crypto_req(zcbor_state_t *state, struct psa_crypto_req *r (((*result).psa_crypto_req_msg_choice = psa_crypto_req_msg_psa_crypto_init_req_m_c), true)) || - (zcbor_union_elem_code(state) && - (((decode_psa_get_key_attributes_req( - state, - (&(*result) - .psa_crypto_req_msg_psa_get_key_attributes_req_m)))) && - (((*result).psa_crypto_req_msg_choice = - psa_crypto_req_msg_psa_get_key_attributes_req_m_c), - true))) || + (((decode_psa_get_key_attributes_req( + state, + (&(*result) + .psa_crypto_req_msg_psa_get_key_attributes_req_m)))) && + (((*result).psa_crypto_req_msg_choice = + psa_crypto_req_msg_psa_get_key_attributes_req_m_c), + true)) || (zcbor_union_elem_code(state) && (((decode_psa_reset_key_attributes_req( state, @@ -2443,14 +1940,8 @@ static bool decode_psa_crypto_req(zcbor_state_t *state, struct psa_crypto_req *r (zcbor_list_map_end_force_decode(state), false)) && zcbor_list_end_decode(state)))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } int cbor_decode_psa_crypto_req(const uint8_t *payload, size_t payload_len, diff --git a/subsys/sdfw_services/services/psa_crypto/zcbor_generated/psa_crypto_service_decode.h b/subsys/sdfw_services/services/psa_crypto/zcbor_generated/psa_crypto_service_decode.h index 2902793fabd8..1493abbfd418 100644 --- a/subsys/sdfw_services/services/psa_crypto/zcbor_generated/psa_crypto_service_decode.h +++ b/subsys/sdfw_services/services/psa_crypto/zcbor_generated/psa_crypto_service_decode.h @@ -1,11 +1,11 @@ /* - * Copyright (c) 2024 Nordic Semiconductor ASA + * Copyright (c) 2025 Nordic Semiconductor ASA * * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ /* - * Generated using zcbor version 0.8.99 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */ diff --git a/subsys/sdfw_services/services/psa_crypto/zcbor_generated/psa_crypto_service_encode.c b/subsys/sdfw_services/services/psa_crypto/zcbor_generated/psa_crypto_service_encode.c index 4925a38f7d58..b1d3eac738bf 100644 --- a/subsys/sdfw_services/services/psa_crypto/zcbor_generated/psa_crypto_service_encode.c +++ b/subsys/sdfw_services/services/psa_crypto/zcbor_generated/psa_crypto_service_encode.c @@ -1,11 +1,11 @@ /* - * Copyright (c) 2024 Nordic Semiconductor ASA + * Copyright (c) 2025 Nordic Semiconductor ASA * * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ /* - * Generated using zcbor version 0.8.99 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */ @@ -22,6 +22,17 @@ #error "The type file was generated with a different default_max_qty than this file" #endif +#define log_result(state, result, func) \ + do { \ + if (!result) { \ + zcbor_trace_file(state); \ + zcbor_log("%s error: %s\r\n", func, \ + zcbor_error_str(zcbor_peek_error(state))); \ + } else { \ + zcbor_log("%s success\r\n", func); \ + } \ + } while (0) + static bool encode_ptr_attr(zcbor_state_t *state, const uint32_t *input); static bool encode_psa_get_key_attributes_req(zcbor_state_t *state, const struct psa_get_key_attributes_req *input); @@ -172,17 +183,10 @@ static bool encode_ptr_attr(zcbor_state_t *state, const uint32_t *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - ((zcbor_tag_put(state, 32772) && (zcbor_uint32_encode(state, (&(*input)))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = ((zcbor_tag_put(state, 32772) && (zcbor_uint32_encode(state, (&(*input)))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_get_key_attributes_req(zcbor_state_t *state, @@ -190,19 +194,13 @@ static bool encode_psa_get_key_attributes_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = (( + bool res = (( (((zcbor_uint32_put(state, (11)))) && ((zcbor_uint32_encode(state, (&(*input).psa_get_key_attributes_req_key)))) && ((encode_ptr_attr(state, (&(*input).psa_get_key_attributes_req_p_attributes))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_reset_key_attributes_req(zcbor_state_t *state, @@ -210,73 +208,46 @@ static bool encode_psa_reset_key_attributes_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (12)))) && - ((encode_ptr_attr(state, - (&(*input).psa_reset_key_attributes_req_p_attributes))))))); + bool res = (((((zcbor_uint32_put(state, (12)))) && + ((encode_ptr_attr(state, + (&(*input).psa_reset_key_attributes_req_p_attributes))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_purge_key_req(zcbor_state_t *state, const struct psa_purge_key_req *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = (((((zcbor_uint32_put(state, (13)))) && - ((zcbor_uint32_encode(state, (&(*input).psa_purge_key_req_key))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_put(state, (13)))) && + ((zcbor_uint32_encode(state, (&(*input).psa_purge_key_req_key))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_ptr_key(zcbor_state_t *state, const uint32_t *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - ((zcbor_tag_put(state, 32773) && (zcbor_uint32_encode(state, (&(*input)))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = ((zcbor_tag_put(state, 32773) && (zcbor_uint32_encode(state, (&(*input)))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_copy_key_req(zcbor_state_t *state, const struct psa_copy_key_req *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (14)))) && - ((zcbor_uint32_encode(state, (&(*input).psa_copy_key_req_source_key)))) && - ((encode_ptr_attr(state, (&(*input).psa_copy_key_req_p_attributes)))) && - ((encode_ptr_key(state, (&(*input).psa_copy_key_req_p_target_key))))))); + bool res = (((((zcbor_uint32_put(state, (14)))) && + ((zcbor_uint32_encode(state, (&(*input).psa_copy_key_req_source_key)))) && + ((encode_ptr_attr(state, (&(*input).psa_copy_key_req_p_attributes)))) && + ((encode_ptr_key(state, (&(*input).psa_copy_key_req_p_target_key))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_destroy_key_req(zcbor_state_t *state, @@ -284,110 +255,69 @@ static bool encode_psa_destroy_key_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = (((((zcbor_uint32_put(state, (15)))) && - ((zcbor_uint32_encode(state, (&(*input).psa_destroy_key_req_key))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_put(state, (15)))) && + ((zcbor_uint32_encode(state, (&(*input).psa_destroy_key_req_key))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_ptr_buf(zcbor_state_t *state, const uint32_t *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - ((zcbor_tag_put(state, 32770) && (zcbor_uint32_encode(state, (&(*input)))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = ((zcbor_tag_put(state, 32770) && (zcbor_uint32_encode(state, (&(*input)))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_buf_len(zcbor_state_t *state, const uint32_t *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - ((zcbor_tag_put(state, 32771) && (zcbor_uint32_encode(state, (&(*input)))))); + bool res = ((zcbor_tag_put(state, 32771) && (zcbor_uint32_encode(state, (&(*input)))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_import_key_req(zcbor_state_t *state, const struct psa_import_key_req *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (16)))) && - ((encode_ptr_attr(state, (&(*input).psa_import_key_req_p_attributes)))) && - ((encode_ptr_buf(state, (&(*input).psa_import_key_req_p_data)))) && - ((encode_buf_len(state, (&(*input).psa_import_key_req_data_length)))) && - ((encode_ptr_key(state, (&(*input).psa_import_key_req_p_key))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_put(state, (16)))) && + ((encode_ptr_attr(state, (&(*input).psa_import_key_req_p_attributes)))) && + ((encode_ptr_buf(state, (&(*input).psa_import_key_req_p_data)))) && + ((encode_buf_len(state, (&(*input).psa_import_key_req_data_length)))) && + ((encode_ptr_key(state, (&(*input).psa_import_key_req_p_key))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_ptr_uint(zcbor_state_t *state, const uint32_t *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - ((zcbor_tag_put(state, 32774) && (zcbor_uint32_encode(state, (&(*input)))))); + bool res = ((zcbor_tag_put(state, 32774) && (zcbor_uint32_encode(state, (&(*input)))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_export_key_req(zcbor_state_t *state, const struct psa_export_key_req *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (17)))) && - ((zcbor_uint32_encode(state, (&(*input).psa_export_key_req_key)))) && - ((encode_ptr_buf(state, (&(*input).psa_export_key_req_p_data)))) && - ((encode_buf_len(state, (&(*input).psa_export_key_req_data_size)))) && - ((encode_ptr_uint(state, (&(*input).psa_export_key_req_p_data_length))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_put(state, (17)))) && + ((zcbor_uint32_encode(state, (&(*input).psa_export_key_req_key)))) && + ((encode_ptr_buf(state, (&(*input).psa_export_key_req_p_data)))) && + ((encode_buf_len(state, (&(*input).psa_export_key_req_data_size)))) && + ((encode_ptr_uint(state, (&(*input).psa_export_key_req_p_data_length))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_export_public_key_req(zcbor_state_t *state, @@ -395,21 +325,15 @@ static bool encode_psa_export_public_key_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = (( + bool res = (( (((zcbor_uint32_put(state, (18)))) && ((zcbor_uint32_encode(state, (&(*input).psa_export_public_key_req_key)))) && ((encode_ptr_buf(state, (&(*input).psa_export_public_key_req_p_data)))) && ((encode_buf_len(state, (&(*input).psa_export_public_key_req_data_size)))) && ((encode_ptr_uint(state, (&(*input).psa_export_public_key_req_p_data_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_hash_compute_req(zcbor_state_t *state, @@ -417,23 +341,16 @@ static bool encode_psa_hash_compute_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (19)))) && - ((zcbor_uint32_encode(state, (&(*input).psa_hash_compute_req_alg)))) && - ((encode_ptr_buf(state, (&(*input).psa_hash_compute_req_p_input)))) && - ((encode_buf_len(state, (&(*input).psa_hash_compute_req_input_length)))) && - ((encode_ptr_buf(state, (&(*input).psa_hash_compute_req_p_hash)))) && - ((encode_buf_len(state, (&(*input).psa_hash_compute_req_hash_size)))) && - ((encode_ptr_uint(state, (&(*input).psa_hash_compute_req_p_hash_length))))))); + bool res = (((((zcbor_uint32_put(state, (19)))) && + ((zcbor_uint32_encode(state, (&(*input).psa_hash_compute_req_alg)))) && + ((encode_ptr_buf(state, (&(*input).psa_hash_compute_req_p_input)))) && + ((encode_buf_len(state, (&(*input).psa_hash_compute_req_input_length)))) && + ((encode_ptr_buf(state, (&(*input).psa_hash_compute_req_p_hash)))) && + ((encode_buf_len(state, (&(*input).psa_hash_compute_req_hash_size)))) && + ((encode_ptr_uint(state, (&(*input).psa_hash_compute_req_p_hash_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_hash_compare_req(zcbor_state_t *state, @@ -441,40 +358,27 @@ static bool encode_psa_hash_compare_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (20)))) && - ((zcbor_uint32_encode(state, (&(*input).psa_hash_compare_req_alg)))) && - ((encode_ptr_buf(state, (&(*input).psa_hash_compare_req_p_input)))) && - ((encode_buf_len(state, (&(*input).psa_hash_compare_req_input_length)))) && - ((encode_ptr_buf(state, (&(*input).psa_hash_compare_req_p_hash)))) && - ((encode_buf_len(state, (&(*input).psa_hash_compare_req_hash_length))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_put(state, (20)))) && + ((zcbor_uint32_encode(state, (&(*input).psa_hash_compare_req_alg)))) && + ((encode_ptr_buf(state, (&(*input).psa_hash_compare_req_p_input)))) && + ((encode_buf_len(state, (&(*input).psa_hash_compare_req_input_length)))) && + ((encode_ptr_buf(state, (&(*input).psa_hash_compare_req_p_hash)))) && + ((encode_buf_len(state, (&(*input).psa_hash_compare_req_hash_length))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_hash_setup_req(zcbor_state_t *state, const struct psa_hash_setup_req *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = (((((zcbor_uint32_put(state, (21)))) && - ((encode_ptr_uint(state, (&(*input).psa_hash_setup_req_p_handle)))) && - ((zcbor_uint32_encode(state, (&(*input).psa_hash_setup_req_alg))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_put(state, (21)))) && + ((encode_ptr_uint(state, (&(*input).psa_hash_setup_req_p_handle)))) && + ((zcbor_uint32_encode(state, (&(*input).psa_hash_setup_req_alg))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_hash_update_req(zcbor_state_t *state, @@ -482,20 +386,13 @@ static bool encode_psa_hash_update_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (22)))) && - ((encode_ptr_uint(state, (&(*input).psa_hash_update_req_p_handle)))) && - ((encode_ptr_buf(state, (&(*input).psa_hash_update_req_p_input)))) && - ((encode_buf_len(state, (&(*input).psa_hash_update_req_input_length))))))); + bool res = (((((zcbor_uint32_put(state, (22)))) && + ((encode_ptr_uint(state, (&(*input).psa_hash_update_req_p_handle)))) && + ((encode_ptr_buf(state, (&(*input).psa_hash_update_req_p_input)))) && + ((encode_buf_len(state, (&(*input).psa_hash_update_req_input_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_hash_finish_req(zcbor_state_t *state, @@ -503,21 +400,14 @@ static bool encode_psa_hash_finish_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (23)))) && - ((encode_ptr_uint(state, (&(*input).psa_hash_finish_req_p_handle)))) && - ((encode_ptr_buf(state, (&(*input).psa_hash_finish_req_p_hash)))) && - ((encode_buf_len(state, (&(*input).psa_hash_finish_req_hash_size)))) && - ((encode_ptr_uint(state, (&(*input).psa_hash_finish_req_p_hash_length))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_put(state, (23)))) && + ((encode_ptr_uint(state, (&(*input).psa_hash_finish_req_p_handle)))) && + ((encode_ptr_buf(state, (&(*input).psa_hash_finish_req_p_hash)))) && + ((encode_buf_len(state, (&(*input).psa_hash_finish_req_hash_size)))) && + ((encode_ptr_uint(state, (&(*input).psa_hash_finish_req_p_hash_length))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_hash_verify_req(zcbor_state_t *state, @@ -525,56 +415,36 @@ static bool encode_psa_hash_verify_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (24)))) && - ((encode_ptr_uint(state, (&(*input).psa_hash_verify_req_p_handle)))) && - ((encode_ptr_buf(state, (&(*input).psa_hash_verify_req_p_hash)))) && - ((encode_buf_len(state, (&(*input).psa_hash_verify_req_hash_length))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_put(state, (24)))) && + ((encode_ptr_uint(state, (&(*input).psa_hash_verify_req_p_handle)))) && + ((encode_ptr_buf(state, (&(*input).psa_hash_verify_req_p_hash)))) && + ((encode_buf_len(state, (&(*input).psa_hash_verify_req_hash_length))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_hash_abort_req(zcbor_state_t *state, const struct psa_hash_abort_req *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = (((((zcbor_uint32_put(state, (25)))) && - ((encode_ptr_uint(state, (&(*input).psa_hash_abort_req_p_handle))))))); + bool res = (((((zcbor_uint32_put(state, (25)))) && + ((encode_ptr_uint(state, (&(*input).psa_hash_abort_req_p_handle))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_hash_clone_req(zcbor_state_t *state, const struct psa_hash_clone_req *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (26)))) && - ((zcbor_uint32_encode(state, (&(*input).psa_hash_clone_req_handle)))) && - ((encode_ptr_uint(state, (&(*input).psa_hash_clone_req_p_handle))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_put(state, (26)))) && + ((zcbor_uint32_encode(state, (&(*input).psa_hash_clone_req_handle)))) && + ((encode_ptr_uint(state, (&(*input).psa_hash_clone_req_p_handle))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_mac_compute_req(zcbor_state_t *state, @@ -582,47 +452,33 @@ static bool encode_psa_mac_compute_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (27)))) && - ((zcbor_uint32_encode(state, (&(*input).psa_mac_compute_req_key)))) && - ((zcbor_uint32_encode(state, (&(*input).psa_mac_compute_req_alg)))) && - ((encode_ptr_buf(state, (&(*input).psa_mac_compute_req_p_input)))) && - ((encode_buf_len(state, (&(*input).psa_mac_compute_req_input_length)))) && - ((encode_ptr_buf(state, (&(*input).psa_mac_compute_req_p_mac)))) && - ((encode_buf_len(state, (&(*input).psa_mac_compute_req_mac_size)))) && - ((encode_ptr_uint(state, (&(*input).psa_mac_compute_req_p_mac_length))))))); + bool res = (((((zcbor_uint32_put(state, (27)))) && + ((zcbor_uint32_encode(state, (&(*input).psa_mac_compute_req_key)))) && + ((zcbor_uint32_encode(state, (&(*input).psa_mac_compute_req_alg)))) && + ((encode_ptr_buf(state, (&(*input).psa_mac_compute_req_p_input)))) && + ((encode_buf_len(state, (&(*input).psa_mac_compute_req_input_length)))) && + ((encode_ptr_buf(state, (&(*input).psa_mac_compute_req_p_mac)))) && + ((encode_buf_len(state, (&(*input).psa_mac_compute_req_mac_size)))) && + ((encode_ptr_uint(state, (&(*input).psa_mac_compute_req_p_mac_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_mac_verify_req(zcbor_state_t *state, const struct psa_mac_verify_req *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (28)))) && - ((zcbor_uint32_encode(state, (&(*input).psa_mac_verify_req_key)))) && - ((zcbor_uint32_encode(state, (&(*input).psa_mac_verify_req_alg)))) && - ((encode_ptr_buf(state, (&(*input).psa_mac_verify_req_p_input)))) && - ((encode_buf_len(state, (&(*input).psa_mac_verify_req_input_length)))) && - ((encode_ptr_buf(state, (&(*input).psa_mac_verify_req_p_mac)))) && - ((encode_buf_len(state, (&(*input).psa_mac_verify_req_mac_length))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_put(state, (28)))) && + ((zcbor_uint32_encode(state, (&(*input).psa_mac_verify_req_key)))) && + ((zcbor_uint32_encode(state, (&(*input).psa_mac_verify_req_alg)))) && + ((encode_ptr_buf(state, (&(*input).psa_mac_verify_req_p_input)))) && + ((encode_buf_len(state, (&(*input).psa_mac_verify_req_input_length)))) && + ((encode_ptr_buf(state, (&(*input).psa_mac_verify_req_p_mac)))) && + ((encode_buf_len(state, (&(*input).psa_mac_verify_req_mac_length))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_mac_sign_setup_req(zcbor_state_t *state, @@ -630,20 +486,13 @@ static bool encode_psa_mac_sign_setup_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (29)))) && - ((encode_ptr_uint(state, (&(*input).psa_mac_sign_setup_req_p_handle)))) && - ((zcbor_uint32_encode(state, (&(*input).psa_mac_sign_setup_req_key)))) && - ((zcbor_uint32_encode(state, (&(*input).psa_mac_sign_setup_req_alg))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_put(state, (29)))) && + ((encode_ptr_uint(state, (&(*input).psa_mac_sign_setup_req_p_handle)))) && + ((zcbor_uint32_encode(state, (&(*input).psa_mac_sign_setup_req_key)))) && + ((zcbor_uint32_encode(state, (&(*input).psa_mac_sign_setup_req_alg))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_mac_verify_setup_req(zcbor_state_t *state, @@ -651,40 +500,26 @@ static bool encode_psa_mac_verify_setup_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (30)))) && - ((encode_ptr_uint(state, (&(*input).psa_mac_verify_setup_req_p_handle)))) && - ((zcbor_uint32_encode(state, (&(*input).psa_mac_verify_setup_req_key)))) && - ((zcbor_uint32_encode(state, (&(*input).psa_mac_verify_setup_req_alg))))))); + bool res = (((((zcbor_uint32_put(state, (30)))) && + ((encode_ptr_uint(state, (&(*input).psa_mac_verify_setup_req_p_handle)))) && + ((zcbor_uint32_encode(state, (&(*input).psa_mac_verify_setup_req_key)))) && + ((zcbor_uint32_encode(state, (&(*input).psa_mac_verify_setup_req_alg))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_mac_update_req(zcbor_state_t *state, const struct psa_mac_update_req *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (31)))) && - ((encode_ptr_uint(state, (&(*input).psa_mac_update_req_p_handle)))) && - ((encode_ptr_buf(state, (&(*input).psa_mac_update_req_p_input)))) && - ((encode_buf_len(state, (&(*input).psa_mac_update_req_input_length))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_put(state, (31)))) && + ((encode_ptr_uint(state, (&(*input).psa_mac_update_req_p_handle)))) && + ((encode_ptr_buf(state, (&(*input).psa_mac_update_req_p_input)))) && + ((encode_buf_len(state, (&(*input).psa_mac_update_req_input_length))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_mac_sign_finish_req(zcbor_state_t *state, @@ -692,21 +527,15 @@ static bool encode_psa_mac_sign_finish_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_put(state, (32)))) && ((encode_ptr_uint(state, (&(*input).psa_mac_sign_finish_req_p_handle)))) && ((encode_ptr_buf(state, (&(*input).psa_mac_sign_finish_req_p_mac)))) && ((encode_buf_len(state, (&(*input).psa_mac_sign_finish_req_mac_size)))) && ((encode_ptr_uint(state, (&(*input).psa_mac_sign_finish_req_p_mac_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_mac_verify_finish_req(zcbor_state_t *state, @@ -714,37 +543,25 @@ static bool encode_psa_mac_verify_finish_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_put(state, (33)))) && ((encode_ptr_uint(state, (&(*input).psa_mac_verify_finish_req_p_handle)))) && ((encode_ptr_buf(state, (&(*input).psa_mac_verify_finish_req_p_mac)))) && ((encode_buf_len(state, (&(*input).psa_mac_verify_finish_req_mac_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_mac_abort_req(zcbor_state_t *state, const struct psa_mac_abort_req *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = (((((zcbor_uint32_put(state, (34)))) && - ((encode_ptr_uint(state, (&(*input).psa_mac_abort_req_p_handle))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_put(state, (34)))) && + ((encode_ptr_uint(state, (&(*input).psa_mac_abort_req_p_handle))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_cipher_encrypt_req(zcbor_state_t *state, @@ -752,7 +569,7 @@ static bool encode_psa_cipher_encrypt_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = (( + bool res = (( (((zcbor_uint32_put(state, (35)))) && ((zcbor_uint32_encode(state, (&(*input).psa_cipher_encrypt_req_key)))) && ((zcbor_uint32_encode(state, (&(*input).psa_cipher_encrypt_req_alg)))) && @@ -762,14 +579,8 @@ static bool encode_psa_cipher_encrypt_req(zcbor_state_t *state, ((encode_buf_len(state, (&(*input).psa_cipher_encrypt_req_output_size)))) && ((encode_ptr_uint(state, (&(*input).psa_cipher_encrypt_req_p_output_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_cipher_decrypt_req(zcbor_state_t *state, @@ -777,7 +588,7 @@ static bool encode_psa_cipher_decrypt_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = (( + bool res = (( (((zcbor_uint32_put(state, (36)))) && ((zcbor_uint32_encode(state, (&(*input).psa_cipher_decrypt_req_key)))) && ((zcbor_uint32_encode(state, (&(*input).psa_cipher_decrypt_req_alg)))) && @@ -787,14 +598,8 @@ static bool encode_psa_cipher_decrypt_req(zcbor_state_t *state, ((encode_buf_len(state, (&(*input).psa_cipher_decrypt_req_output_size)))) && ((encode_ptr_uint(state, (&(*input).psa_cipher_decrypt_req_p_output_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_cipher_encrypt_setup_req(zcbor_state_t *state, @@ -802,20 +607,14 @@ static bool encode_psa_cipher_encrypt_setup_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_put(state, (37)))) && ((encode_ptr_uint(state, (&(*input).psa_cipher_encrypt_setup_req_p_handle)))) && ((zcbor_uint32_encode(state, (&(*input).psa_cipher_encrypt_setup_req_key)))) && ((zcbor_uint32_encode(state, (&(*input).psa_cipher_encrypt_setup_req_alg))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_cipher_decrypt_setup_req(zcbor_state_t *state, @@ -823,20 +622,14 @@ static bool encode_psa_cipher_decrypt_setup_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_put(state, (38)))) && ((encode_ptr_uint(state, (&(*input).psa_cipher_decrypt_setup_req_p_handle)))) && ((zcbor_uint32_encode(state, (&(*input).psa_cipher_decrypt_setup_req_key)))) && ((zcbor_uint32_encode(state, (&(*input).psa_cipher_decrypt_setup_req_alg))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_cipher_generate_iv_req(zcbor_state_t *state, @@ -844,21 +637,15 @@ static bool encode_psa_cipher_generate_iv_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = (( + bool res = (( (((zcbor_uint32_put(state, (39)))) && ((encode_ptr_uint(state, (&(*input).psa_cipher_generate_iv_req_p_handle)))) && ((encode_ptr_buf(state, (&(*input).psa_cipher_generate_iv_req_p_iv)))) && ((encode_buf_len(state, (&(*input).psa_cipher_generate_iv_req_iv_size)))) && ((encode_ptr_uint(state, (&(*input).psa_cipher_generate_iv_req_p_iv_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_cipher_set_iv_req(zcbor_state_t *state, @@ -866,20 +653,13 @@ static bool encode_psa_cipher_set_iv_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (40)))) && - ((encode_ptr_uint(state, (&(*input).psa_cipher_set_iv_req_p_handle)))) && - ((encode_ptr_buf(state, (&(*input).psa_cipher_set_iv_req_p_iv)))) && - ((encode_buf_len(state, (&(*input).psa_cipher_set_iv_req_iv_length))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_put(state, (40)))) && + ((encode_ptr_uint(state, (&(*input).psa_cipher_set_iv_req_p_handle)))) && + ((encode_ptr_buf(state, (&(*input).psa_cipher_set_iv_req_p_iv)))) && + ((encode_buf_len(state, (&(*input).psa_cipher_set_iv_req_iv_length))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_cipher_update_req(zcbor_state_t *state, @@ -887,7 +667,7 @@ static bool encode_psa_cipher_update_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_put(state, (41)))) && ((encode_ptr_uint(state, (&(*input).psa_cipher_update_req_p_handle)))) && ((encode_ptr_buf(state, (&(*input).psa_cipher_update_req_p_input)))) && @@ -896,14 +676,8 @@ static bool encode_psa_cipher_update_req(zcbor_state_t *state, ((encode_buf_len(state, (&(*input).psa_cipher_update_req_output_size)))) && ((encode_ptr_uint(state, (&(*input).psa_cipher_update_req_p_output_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_cipher_finish_req(zcbor_state_t *state, @@ -911,21 +685,15 @@ static bool encode_psa_cipher_finish_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_put(state, (42)))) && ((encode_ptr_uint(state, (&(*input).psa_cipher_finish_req_p_handle)))) && ((encode_ptr_buf(state, (&(*input).psa_cipher_finish_req_p_output)))) && ((encode_buf_len(state, (&(*input).psa_cipher_finish_req_output_size)))) && ((encode_ptr_uint(state, (&(*input).psa_cipher_finish_req_p_output_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_cipher_abort_req(zcbor_state_t *state, @@ -933,18 +701,11 @@ static bool encode_psa_cipher_abort_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (43)))) && - ((encode_ptr_uint(state, (&(*input).psa_cipher_abort_req_p_handle))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_put(state, (43)))) && + ((encode_ptr_uint(state, (&(*input).psa_cipher_abort_req_p_handle))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_aead_encrypt_req(zcbor_state_t *state, @@ -952,7 +713,7 @@ static bool encode_psa_aead_encrypt_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = ((( + bool res = ((( ((zcbor_uint32_put(state, (44)))) && ((zcbor_uint32_encode(state, (&(*input).psa_aead_encrypt_req_key)))) && ((zcbor_uint32_encode(state, (&(*input).psa_aead_encrypt_req_alg)))) && @@ -967,14 +728,8 @@ static bool encode_psa_aead_encrypt_req(zcbor_state_t *state, ((encode_buf_len(state, (&(*input).psa_aead_encrypt_req_ciphertext_size)))) && ((encode_ptr_uint(state, (&(*input).psa_aead_encrypt_req_p_ciphertext_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_aead_decrypt_req(zcbor_state_t *state, @@ -982,7 +737,7 @@ static bool encode_psa_aead_decrypt_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = (( + bool res = (( (((zcbor_uint32_put(state, (45)))) && ((zcbor_uint32_encode(state, (&(*input).psa_aead_decrypt_req_key)))) && ((zcbor_uint32_encode(state, (&(*input).psa_aead_decrypt_req_alg)))) && @@ -997,14 +752,8 @@ static bool encode_psa_aead_decrypt_req(zcbor_state_t *state, ((encode_buf_len(state, (&(*input).psa_aead_decrypt_req_plaintext_size)))) && ((encode_ptr_uint(state, (&(*input).psa_aead_decrypt_req_p_plaintext_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_aead_encrypt_setup_req(zcbor_state_t *state, @@ -1012,20 +761,13 @@ static bool encode_psa_aead_encrypt_setup_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (46)))) && - ((encode_ptr_uint(state, (&(*input).psa_aead_encrypt_setup_req_p_handle)))) && - ((zcbor_uint32_encode(state, (&(*input).psa_aead_encrypt_setup_req_key)))) && - ((zcbor_uint32_encode(state, (&(*input).psa_aead_encrypt_setup_req_alg))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_put(state, (46)))) && + ((encode_ptr_uint(state, (&(*input).psa_aead_encrypt_setup_req_p_handle)))) && + ((zcbor_uint32_encode(state, (&(*input).psa_aead_encrypt_setup_req_key)))) && + ((zcbor_uint32_encode(state, (&(*input).psa_aead_encrypt_setup_req_alg))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_aead_decrypt_setup_req(zcbor_state_t *state, @@ -1033,20 +775,13 @@ static bool encode_psa_aead_decrypt_setup_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (47)))) && - ((encode_ptr_uint(state, (&(*input).psa_aead_decrypt_setup_req_p_handle)))) && - ((zcbor_uint32_encode(state, (&(*input).psa_aead_decrypt_setup_req_key)))) && - ((zcbor_uint32_encode(state, (&(*input).psa_aead_decrypt_setup_req_alg))))))); + bool res = (((((zcbor_uint32_put(state, (47)))) && + ((encode_ptr_uint(state, (&(*input).psa_aead_decrypt_setup_req_p_handle)))) && + ((zcbor_uint32_encode(state, (&(*input).psa_aead_decrypt_setup_req_key)))) && + ((zcbor_uint32_encode(state, (&(*input).psa_aead_decrypt_setup_req_alg))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_aead_generate_nonce_req(zcbor_state_t *state, @@ -1054,7 +789,7 @@ static bool encode_psa_aead_generate_nonce_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_put(state, (48)))) && ((encode_ptr_uint(state, (&(*input).psa_aead_generate_nonce_req_p_handle)))) && ((encode_ptr_buf(state, (&(*input).psa_aead_generate_nonce_req_p_nonce)))) && @@ -1062,14 +797,8 @@ static bool encode_psa_aead_generate_nonce_req(zcbor_state_t *state, ((encode_ptr_uint(state, (&(*input).psa_aead_generate_nonce_req_p_nonce_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_aead_set_nonce_req(zcbor_state_t *state, @@ -1077,20 +806,13 @@ static bool encode_psa_aead_set_nonce_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (49)))) && - ((encode_ptr_uint(state, (&(*input).psa_aead_set_nonce_req_p_handle)))) && - ((encode_ptr_buf(state, (&(*input).psa_aead_set_nonce_req_p_nonce)))) && - ((encode_buf_len(state, (&(*input).psa_aead_set_nonce_req_nonce_length))))))); + bool res = (((((zcbor_uint32_put(state, (49)))) && + ((encode_ptr_uint(state, (&(*input).psa_aead_set_nonce_req_p_handle)))) && + ((encode_ptr_buf(state, (&(*input).psa_aead_set_nonce_req_p_nonce)))) && + ((encode_buf_len(state, (&(*input).psa_aead_set_nonce_req_nonce_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_aead_set_lengths_req(zcbor_state_t *state, @@ -1098,20 +820,14 @@ static bool encode_psa_aead_set_lengths_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = ((( + bool res = ((( ((zcbor_uint32_put(state, (50)))) && ((encode_ptr_uint(state, (&(*input).psa_aead_set_lengths_req_p_handle)))) && ((encode_buf_len(state, (&(*input).psa_aead_set_lengths_req_ad_length)))) && ((encode_buf_len(state, (&(*input).psa_aead_set_lengths_req_plaintext_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_aead_update_ad_req(zcbor_state_t *state, @@ -1119,20 +835,13 @@ static bool encode_psa_aead_update_ad_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (51)))) && - ((encode_ptr_uint(state, (&(*input).psa_aead_update_ad_req_p_handle)))) && - ((encode_ptr_buf(state, (&(*input).psa_aead_update_ad_req_p_input)))) && - ((encode_buf_len(state, (&(*input).psa_aead_update_ad_req_input_length))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_put(state, (51)))) && + ((encode_ptr_uint(state, (&(*input).psa_aead_update_ad_req_p_handle)))) && + ((encode_ptr_buf(state, (&(*input).psa_aead_update_ad_req_p_input)))) && + ((encode_buf_len(state, (&(*input).psa_aead_update_ad_req_input_length))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_aead_update_req(zcbor_state_t *state, @@ -1140,7 +849,7 @@ static bool encode_psa_aead_update_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_put(state, (52)))) && ((encode_ptr_uint(state, (&(*input).psa_aead_update_req_p_handle)))) && ((encode_ptr_buf(state, (&(*input).psa_aead_update_req_p_input)))) && @@ -1149,14 +858,8 @@ static bool encode_psa_aead_update_req(zcbor_state_t *state, ((encode_buf_len(state, (&(*input).psa_aead_update_req_output_size)))) && ((encode_ptr_uint(state, (&(*input).psa_aead_update_req_p_output_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_aead_finish_req(zcbor_state_t *state, @@ -1164,7 +867,7 @@ static bool encode_psa_aead_finish_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = (( + bool res = (( (((zcbor_uint32_put(state, (53)))) && ((encode_ptr_uint(state, (&(*input).psa_aead_finish_req_p_handle)))) && ((encode_ptr_buf(state, (&(*input).psa_aead_finish_req_p_ciphertext)))) && @@ -1174,14 +877,8 @@ static bool encode_psa_aead_finish_req(zcbor_state_t *state, ((encode_buf_len(state, (&(*input).psa_aead_finish_req_tag_size)))) && ((encode_ptr_uint(state, (&(*input).psa_aead_finish_req_p_tag_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_aead_verify_req(zcbor_state_t *state, @@ -1189,7 +886,7 @@ static bool encode_psa_aead_verify_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_put(state, (54)))) && ((encode_ptr_uint(state, (&(*input).psa_aead_verify_req_p_handle)))) && ((encode_ptr_buf(state, (&(*input).psa_aead_verify_req_p_plaintext)))) && @@ -1198,31 +895,19 @@ static bool encode_psa_aead_verify_req(zcbor_state_t *state, ((encode_ptr_buf(state, (&(*input).psa_aead_verify_req_p_tag)))) && ((encode_buf_len(state, (&(*input).psa_aead_verify_req_tag_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_aead_abort_req(zcbor_state_t *state, const struct psa_aead_abort_req *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = (((((zcbor_uint32_put(state, (55)))) && - ((encode_ptr_uint(state, (&(*input).psa_aead_abort_req_p_handle))))))); + bool res = (((((zcbor_uint32_put(state, (55)))) && + ((encode_ptr_uint(state, (&(*input).psa_aead_abort_req_p_handle))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_sign_message_req(zcbor_state_t *state, @@ -1230,7 +915,7 @@ static bool encode_psa_sign_message_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = (( + bool res = (( (((zcbor_uint32_put(state, (56)))) && ((zcbor_uint32_encode(state, (&(*input).psa_sign_message_req_key)))) && ((zcbor_uint32_encode(state, (&(*input).psa_sign_message_req_alg)))) && @@ -1240,14 +925,8 @@ static bool encode_psa_sign_message_req(zcbor_state_t *state, ((encode_buf_len(state, (&(*input).psa_sign_message_req_signature_size)))) && ((encode_ptr_uint(state, (&(*input).psa_sign_message_req_p_signature_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_verify_message_req(zcbor_state_t *state, @@ -1255,7 +934,7 @@ static bool encode_psa_verify_message_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = (( + bool res = (( (((zcbor_uint32_put(state, (57)))) && ((zcbor_uint32_encode(state, (&(*input).psa_verify_message_req_key)))) && ((zcbor_uint32_encode(state, (&(*input).psa_verify_message_req_alg)))) && @@ -1264,21 +943,15 @@ static bool encode_psa_verify_message_req(zcbor_state_t *state, ((encode_ptr_buf(state, (&(*input).psa_verify_message_req_p_signature)))) && ((encode_buf_len(state, (&(*input).psa_verify_message_req_signature_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_sign_hash_req(zcbor_state_t *state, const struct psa_sign_hash_req *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_put(state, (58)))) && ((zcbor_uint32_encode(state, (&(*input).psa_sign_hash_req_key)))) && ((zcbor_uint32_encode(state, (&(*input).psa_sign_hash_req_alg)))) && @@ -1288,14 +961,8 @@ static bool encode_psa_sign_hash_req(zcbor_state_t *state, const struct psa_sign ((encode_buf_len(state, (&(*input).psa_sign_hash_req_signature_size)))) && ((encode_ptr_uint(state, (&(*input).psa_sign_hash_req_p_signature_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_verify_hash_req(zcbor_state_t *state, @@ -1303,7 +970,7 @@ static bool encode_psa_verify_hash_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_put(state, (59)))) && ((zcbor_uint32_encode(state, (&(*input).psa_verify_hash_req_key)))) && ((zcbor_uint32_encode(state, (&(*input).psa_verify_hash_req_alg)))) && @@ -1312,14 +979,8 @@ static bool encode_psa_verify_hash_req(zcbor_state_t *state, ((encode_ptr_buf(state, (&(*input).psa_verify_hash_req_p_signature)))) && ((encode_buf_len(state, (&(*input).psa_verify_hash_req_signature_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_asymmetric_encrypt_req(zcbor_state_t *state, @@ -1327,7 +988,7 @@ static bool encode_psa_asymmetric_encrypt_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_put(state, (60)))) && ((zcbor_uint32_encode(state, (&(*input).psa_asymmetric_encrypt_req_key)))) && ((zcbor_uint32_encode(state, (&(*input).psa_asymmetric_encrypt_req_alg)))) && @@ -1340,14 +1001,8 @@ static bool encode_psa_asymmetric_encrypt_req(zcbor_state_t *state, ((encode_ptr_uint(state, (&(*input).psa_asymmetric_encrypt_req_p_output_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_asymmetric_decrypt_req(zcbor_state_t *state, @@ -1355,7 +1010,7 @@ static bool encode_psa_asymmetric_decrypt_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_put(state, (61)))) && ((zcbor_uint32_encode(state, (&(*input).psa_asymmetric_decrypt_req_key)))) && ((zcbor_uint32_encode(state, (&(*input).psa_asymmetric_decrypt_req_alg)))) && @@ -1368,14 +1023,8 @@ static bool encode_psa_asymmetric_decrypt_req(zcbor_state_t *state, ((encode_ptr_uint(state, (&(*input).psa_asymmetric_decrypt_req_p_output_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_key_derivation_setup_req(zcbor_state_t *state, @@ -1383,19 +1032,13 @@ static bool encode_psa_key_derivation_setup_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_put(state, (62)))) && ((encode_ptr_uint(state, (&(*input).psa_key_derivation_setup_req_p_handle)))) && ((zcbor_uint32_encode(state, (&(*input).psa_key_derivation_setup_req_alg))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool @@ -1404,21 +1047,15 @@ encode_psa_key_derivation_get_capacity_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_put(state, (63)))) && ((zcbor_uint32_encode( state, (&(*input).psa_key_derivation_get_capacity_req_handle)))) && ((encode_ptr_uint( state, (&(*input).psa_key_derivation_get_capacity_req_p_capacity))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool @@ -1427,21 +1064,14 @@ encode_psa_key_derivation_set_capacity_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (64)))) && - ((encode_ptr_uint(state, - (&(*input).psa_key_derivation_set_capacity_req_p_handle)))) && - ((zcbor_uint32_encode( - state, (&(*input).psa_key_derivation_set_capacity_req_capacity))))))); + bool res = (((((zcbor_uint32_put(state, (64)))) && + ((encode_ptr_uint( + state, (&(*input).psa_key_derivation_set_capacity_req_p_handle)))) && + ((zcbor_uint32_encode( + state, (&(*input).psa_key_derivation_set_capacity_req_capacity))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool @@ -1450,7 +1080,7 @@ encode_psa_key_derivation_input_bytes_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = (( + bool res = (( (((zcbor_uint32_put(state, (65)))) && ((encode_ptr_uint(state, (&(*input).psa_key_derivation_input_bytes_req_p_handle)))) && @@ -1460,14 +1090,8 @@ encode_psa_key_derivation_input_bytes_req(zcbor_state_t *state, ((encode_buf_len(state, (&(*input).psa_key_derivation_input_bytes_req_data_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_key_derivation_input_integer_req( @@ -1475,23 +1099,16 @@ static bool encode_psa_key_derivation_input_integer_req( { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (66)))) && - ((encode_ptr_uint(state, - (&(*input).psa_key_derivation_input_integer_req_p_handle)))) && - ((zcbor_uint32_encode(state, - (&(*input).psa_key_derivation_input_integer_req_step)))) && - ((zcbor_uint32_encode( - state, (&(*input).psa_key_derivation_input_integer_req_value))))))); + bool res = (((((zcbor_uint32_put(state, (66)))) && + ((encode_ptr_uint( + state, (&(*input).psa_key_derivation_input_integer_req_p_handle)))) && + ((zcbor_uint32_encode( + state, (&(*input).psa_key_derivation_input_integer_req_step)))) && + ((zcbor_uint32_encode( + state, (&(*input).psa_key_derivation_input_integer_req_value))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool @@ -1500,20 +1117,14 @@ encode_psa_key_derivation_input_key_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = ((( + bool res = ((( ((zcbor_uint32_put(state, (67)))) && ((encode_ptr_uint(state, (&(*input).psa_key_derivation_input_key_req_p_handle)))) && ((zcbor_uint32_encode(state, (&(*input).psa_key_derivation_input_key_req_step)))) && ((zcbor_uint32_encode(state, (&(*input).psa_key_derivation_input_key_req_key))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_key_derivation_key_agreement_req( @@ -1521,7 +1132,7 @@ static bool encode_psa_key_derivation_key_agreement_req( { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_put(state, (68)))) && ((encode_ptr_uint(state, (&(*input).psa_key_derivation_key_agreement_req_p_handle)))) && @@ -1535,14 +1146,8 @@ static bool encode_psa_key_derivation_key_agreement_req( state, (&(*input).psa_key_derivation_key_agreement_req_peer_key_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool @@ -1551,7 +1156,7 @@ encode_psa_key_derivation_output_bytes_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = (( + bool res = (( (((zcbor_uint32_put(state, (69)))) && ((encode_ptr_uint(state, (&(*input).psa_key_derivation_output_bytes_req_p_handle)))) && @@ -1560,14 +1165,8 @@ encode_psa_key_derivation_output_bytes_req(zcbor_state_t *state, ((encode_buf_len( state, (&(*input).psa_key_derivation_output_bytes_req_output_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool @@ -1576,7 +1175,7 @@ encode_psa_key_derivation_output_key_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = (( + bool res = (( (((zcbor_uint32_put(state, (70)))) && ((encode_ptr_attr(state, (&(*input).psa_key_derivation_output_key_req_p_attributes)))) && @@ -1584,14 +1183,8 @@ encode_psa_key_derivation_output_key_req(zcbor_state_t *state, (&(*input).psa_key_derivation_output_key_req_p_handle)))) && ((encode_ptr_key(state, (&(*input).psa_key_derivation_output_key_req_p_key))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_key_derivation_abort_req(zcbor_state_t *state, @@ -1599,18 +1192,12 @@ static bool encode_psa_key_derivation_abort_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_put(state, (71)))) && ((encode_ptr_uint(state, (&(*input).psa_key_derivation_abort_req_p_handle))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_raw_key_agreement_req(zcbor_state_t *state, @@ -1618,7 +1205,7 @@ static bool encode_psa_raw_key_agreement_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = ((( + bool res = ((( ((zcbor_uint32_put(state, (72)))) && ((zcbor_uint32_encode(state, (&(*input).psa_raw_key_agreement_req_alg)))) && ((zcbor_uint32_encode(state, (&(*input).psa_raw_key_agreement_req_private_key)))) && @@ -1629,14 +1216,8 @@ static bool encode_psa_raw_key_agreement_req(zcbor_state_t *state, ((encode_ptr_uint(state, (&(*input).psa_raw_key_agreement_req_p_output_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_generate_random_req(zcbor_state_t *state, @@ -1644,19 +1225,12 @@ static bool encode_psa_generate_random_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (73)))) && - ((encode_ptr_buf(state, (&(*input).psa_generate_random_req_p_output)))) && - ((encode_buf_len(state, (&(*input).psa_generate_random_req_output_size))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_put(state, (73)))) && + ((encode_ptr_buf(state, (&(*input).psa_generate_random_req_p_output)))) && + ((encode_buf_len(state, (&(*input).psa_generate_random_req_output_size))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_generate_key_req(zcbor_state_t *state, @@ -1664,56 +1238,36 @@ static bool encode_psa_generate_key_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (74)))) && - ((encode_ptr_attr(state, (&(*input).psa_generate_key_req_p_attributes)))) && - ((encode_ptr_key(state, (&(*input).psa_generate_key_req_p_key))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_put(state, (74)))) && + ((encode_ptr_attr(state, (&(*input).psa_generate_key_req_p_attributes)))) && + ((encode_ptr_key(state, (&(*input).psa_generate_key_req_p_key))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_ptr_cipher(zcbor_state_t *state, const uint32_t *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - ((zcbor_tag_put(state, 32775) && (zcbor_uint32_encode(state, (&(*input)))))); + bool res = ((zcbor_tag_put(state, 32775) && (zcbor_uint32_encode(state, (&(*input)))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_pake_setup_req(zcbor_state_t *state, const struct psa_pake_setup_req *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_put(state, (79)))) && ((encode_ptr_uint(state, (&(*input).psa_pake_setup_req_p_handle)))) && ((zcbor_uint32_encode(state, (&(*input).psa_pake_setup_req_password_key)))) && ((encode_ptr_cipher(state, (&(*input).psa_pake_setup_req_p_cipher_suite))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_pake_set_role_req(zcbor_state_t *state, @@ -1721,19 +1275,12 @@ static bool encode_psa_pake_set_role_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (80)))) && - ((encode_ptr_uint(state, (&(*input).psa_pake_set_role_req_p_handle)))) && - ((zcbor_uint32_encode(state, (&(*input).psa_pake_set_role_req_role))))))); + bool res = (((((zcbor_uint32_put(state, (80)))) && + ((encode_ptr_uint(state, (&(*input).psa_pake_set_role_req_p_handle)))) && + ((zcbor_uint32_encode(state, (&(*input).psa_pake_set_role_req_role))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_pake_set_user_req(zcbor_state_t *state, @@ -1741,20 +1288,13 @@ static bool encode_psa_pake_set_user_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (81)))) && - ((encode_ptr_uint(state, (&(*input).psa_pake_set_user_req_p_handle)))) && - ((encode_ptr_buf(state, (&(*input).psa_pake_set_user_req_p_user_id)))) && - ((encode_buf_len(state, (&(*input).psa_pake_set_user_req_user_id_len))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_put(state, (81)))) && + ((encode_ptr_uint(state, (&(*input).psa_pake_set_user_req_p_handle)))) && + ((encode_ptr_buf(state, (&(*input).psa_pake_set_user_req_p_user_id)))) && + ((encode_buf_len(state, (&(*input).psa_pake_set_user_req_user_id_len))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_pake_set_peer_req(zcbor_state_t *state, @@ -1762,20 +1302,13 @@ static bool encode_psa_pake_set_peer_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (82)))) && - ((encode_ptr_uint(state, (&(*input).psa_pake_set_peer_req_p_handle)))) && - ((encode_ptr_buf(state, (&(*input).psa_pake_set_peer_req_p_peer_id)))) && - ((encode_buf_len(state, (&(*input).psa_pake_set_peer_req_peer_id_len))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_put(state, (82)))) && + ((encode_ptr_uint(state, (&(*input).psa_pake_set_peer_req_p_handle)))) && + ((encode_ptr_buf(state, (&(*input).psa_pake_set_peer_req_p_peer_id)))) && + ((encode_buf_len(state, (&(*input).psa_pake_set_peer_req_peer_id_len))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_pake_set_context_req(zcbor_state_t *state, @@ -1783,20 +1316,14 @@ static bool encode_psa_pake_set_context_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_put(state, (83)))) && ((encode_ptr_uint(state, (&(*input).psa_pake_set_context_req_p_handle)))) && ((encode_ptr_buf(state, (&(*input).psa_pake_set_context_req_p_context)))) && ((encode_buf_len(state, (&(*input).psa_pake_set_context_req_context_len))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_pake_output_req(zcbor_state_t *state, @@ -1804,7 +1331,7 @@ static bool encode_psa_pake_output_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((((zcbor_uint32_put(state, (84)))) && ((encode_ptr_uint(state, (&(*input).psa_pake_output_req_p_handle)))) && ((zcbor_uint32_encode(state, (&(*input).psa_pake_output_req_step)))) && @@ -1812,35 +1339,22 @@ static bool encode_psa_pake_output_req(zcbor_state_t *state, ((encode_buf_len(state, (&(*input).psa_pake_output_req_output_size)))) && ((encode_ptr_uint(state, (&(*input).psa_pake_output_req_p_output_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_pake_input_req(zcbor_state_t *state, const struct psa_pake_input_req *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (85)))) && - ((encode_ptr_uint(state, (&(*input).psa_pake_input_req_p_handle)))) && - ((zcbor_uint32_encode(state, (&(*input).psa_pake_input_req_step)))) && - ((encode_ptr_buf(state, (&(*input).psa_pake_input_req_p_input)))) && - ((encode_buf_len(state, (&(*input).psa_pake_input_req_input_length))))))); + bool res = (((((zcbor_uint32_put(state, (85)))) && + ((encode_ptr_uint(state, (&(*input).psa_pake_input_req_p_handle)))) && + ((zcbor_uint32_encode(state, (&(*input).psa_pake_input_req_step)))) && + ((encode_ptr_buf(state, (&(*input).psa_pake_input_req_p_input)))) && + ((encode_buf_len(state, (&(*input).psa_pake_input_req_input_length))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_pake_get_shared_key_req(zcbor_state_t *state, @@ -1848,64 +1362,46 @@ static bool encode_psa_pake_get_shared_key_req(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = (( + bool res = (( (((zcbor_uint32_put(state, (86)))) && ((encode_ptr_uint(state, (&(*input).psa_pake_get_shared_key_req_p_handle)))) && ((encode_ptr_attr(state, (&(*input).psa_pake_get_shared_key_req_p_attributes)))) && ((encode_ptr_key(state, (&(*input).psa_pake_get_shared_key_req_p_key))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_pake_abort_req(zcbor_state_t *state, const struct psa_pake_abort_req *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = (((((zcbor_uint32_put(state, (87)))) && - ((encode_ptr_uint(state, (&(*input).psa_pake_abort_req_p_handle))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((((zcbor_uint32_put(state, (87)))) && + ((encode_ptr_uint(state, (&(*input).psa_pake_abort_req_p_handle))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_crypto_rsp(zcbor_state_t *state, const struct psa_crypto_rsp *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = (((zcbor_list_start_encode(state, 2) && - ((((zcbor_uint32_encode(state, (&(*input).psa_crypto_rsp_id)))) && - ((zcbor_int32_encode(state, (&(*input).psa_crypto_rsp_status))))) || - (zcbor_list_map_end_force_encode(state), false)) && - zcbor_list_end_encode(state, 2)))); + bool res = (((zcbor_list_start_encode(state, 2) && + ((((zcbor_uint32_encode(state, (&(*input).psa_crypto_rsp_id)))) && + ((zcbor_int32_encode(state, (&(*input).psa_crypto_rsp_status))))) || + (zcbor_list_map_end_force_encode(state), false)) && + zcbor_list_end_encode(state, 2)))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_psa_crypto_req(zcbor_state_t *state, const struct psa_crypto_req *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = (((zcbor_list_start_encode(state, 12) && ((((((*input).psa_crypto_req_msg_choice == psa_crypto_req_msg_psa_crypto_init_req_m_c) ? ((zcbor_uint32_put(state, (10)))) + bool res = (((zcbor_list_start_encode(state, 12) && ((((((*input).psa_crypto_req_msg_choice == psa_crypto_req_msg_psa_crypto_init_req_m_c) ? ((zcbor_uint32_put(state, (10)))) : (((*input).psa_crypto_req_msg_choice == psa_crypto_req_msg_psa_get_key_attributes_req_m_c) ? ((encode_psa_get_key_attributes_req(state, (&(*input).psa_crypto_req_msg_psa_get_key_attributes_req_m)))) : (((*input).psa_crypto_req_msg_choice == psa_crypto_req_msg_psa_reset_key_attributes_req_m_c) ? ((encode_psa_reset_key_attributes_req(state, (&(*input).psa_crypto_req_msg_psa_reset_key_attributes_req_m)))) : (((*input).psa_crypto_req_msg_choice == psa_crypto_req_msg_psa_purge_key_req_m_c) ? ((encode_psa_purge_key_req(state, (&(*input).psa_crypto_req_msg_psa_purge_key_req_m)))) @@ -1981,14 +1477,8 @@ static bool encode_psa_crypto_req(zcbor_state_t *state, const struct psa_crypto_ : (((*input).psa_crypto_req_msg_choice == psa_crypto_req_msg_psa_pake_abort_req_m_c) ? ((encode_psa_pake_abort_req(state, (&(*input).psa_crypto_req_msg_psa_pake_abort_req_m)))) : false)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))) || (zcbor_list_map_end_force_encode(state), false)) && zcbor_list_end_encode(state, 12)))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } int cbor_encode_psa_crypto_req(uint8_t *payload, size_t payload_len, diff --git a/subsys/sdfw_services/services/psa_crypto/zcbor_generated/psa_crypto_service_encode.h b/subsys/sdfw_services/services/psa_crypto/zcbor_generated/psa_crypto_service_encode.h index 5933ac601bd6..d5f4ed6eb223 100644 --- a/subsys/sdfw_services/services/psa_crypto/zcbor_generated/psa_crypto_service_encode.h +++ b/subsys/sdfw_services/services/psa_crypto/zcbor_generated/psa_crypto_service_encode.h @@ -1,11 +1,11 @@ /* - * Copyright (c) 2024 Nordic Semiconductor ASA + * Copyright (c) 2025 Nordic Semiconductor ASA * * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ /* - * Generated using zcbor version 0.8.99 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */ diff --git a/subsys/sdfw_services/services/psa_crypto/zcbor_generated/psa_crypto_service_types.h b/subsys/sdfw_services/services/psa_crypto/zcbor_generated/psa_crypto_service_types.h index 26e9c0a67367..5405aef2fc1e 100644 --- a/subsys/sdfw_services/services/psa_crypto/zcbor_generated/psa_crypto_service_types.h +++ b/subsys/sdfw_services/services/psa_crypto/zcbor_generated/psa_crypto_service_types.h @@ -1,11 +1,11 @@ /* - * Copyright (c) 2024 Nordic Semiconductor ASA + * Copyright (c) 2025 Nordic Semiconductor ASA * * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ /* - * Generated using zcbor version 0.8.99 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */ diff --git a/subsys/sdfw_services/services/reset_evt/zcbor_generated/CMakeLists.txt b/subsys/sdfw_services/services/reset_evt/zcbor_generated/CMakeLists.txt index ba5122c76dfb..945390b2b36f 100644 --- a/subsys/sdfw_services/services/reset_evt/zcbor_generated/CMakeLists.txt +++ b/subsys/sdfw_services/services/reset_evt/zcbor_generated/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2024 Nordic Semiconductor ASA +# Copyright (c) 2025 Nordic Semiconductor ASA # # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # diff --git a/subsys/sdfw_services/services/reset_evt/zcbor_generated/reset_evt_service_decode.c b/subsys/sdfw_services/services/reset_evt/zcbor_generated/reset_evt_service_decode.c index 0ec42dfada5e..f03e1963db19 100644 --- a/subsys/sdfw_services/services/reset_evt/zcbor_generated/reset_evt_service_decode.c +++ b/subsys/sdfw_services/services/reset_evt/zcbor_generated/reset_evt_service_decode.c @@ -1,11 +1,11 @@ /* - * Copyright (c) 2024 Nordic Semiconductor ASA + * Copyright (c) 2025 Nordic Semiconductor ASA * * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ /* - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */ @@ -22,6 +22,17 @@ #error "The type file was generated with a different default_max_qty than this file" #endif +#define log_result(state, result, func) \ + do { \ + if (!result) { \ + zcbor_trace_file(state); \ + zcbor_log("%s error: %s\r\n", func, \ + zcbor_error_str(zcbor_peek_error(state))); \ + } else { \ + zcbor_log("%s success\r\n", func); \ + } \ + } while (0) + static bool decode_reset_evt_notif(zcbor_state_t *state, struct reset_evt_notif *result); static bool decode_reset_evt_sub_rsp(zcbor_state_t *state, int32_t *result); static bool decode_reset_evt_sub_req(zcbor_state_t *state, bool *result); @@ -30,59 +41,40 @@ static bool decode_reset_evt_notif(zcbor_state_t *state, struct reset_evt_notif { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((zcbor_list_start_decode(state) && - ((((zcbor_uint32_decode(state, (&(*result).reset_evt_notif_domains)))) && - ((zcbor_uint32_decode(state, (&(*result).reset_evt_notif_delay_ms))))) || - (zcbor_list_map_end_force_decode(state), false)) && - zcbor_list_end_decode(state)))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + bool res = (((zcbor_list_start_decode(state) && + ((((zcbor_uint32_decode(state, (&(*result).reset_evt_notif_domains)))) && + ((zcbor_uint32_decode(state, (&(*result).reset_evt_notif_delay_ms))))) || + (zcbor_list_map_end_force_decode(state), false)) && + zcbor_list_end_decode(state)))); + + log_result(state, res, __func__); + return res; } static bool decode_reset_evt_sub_rsp(zcbor_state_t *state, int32_t *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = (((zcbor_list_start_decode(state) && - ((((zcbor_int32_decode(state, (&(*result)))))) || - (zcbor_list_map_end_force_decode(state), false)) && - zcbor_list_end_decode(state)))); + bool res = (((zcbor_list_start_decode(state) && + ((((zcbor_int32_decode(state, (&(*result)))))) || + (zcbor_list_map_end_force_decode(state), false)) && + zcbor_list_end_decode(state)))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_reset_evt_sub_req(zcbor_state_t *state, bool *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = (((zcbor_list_start_decode(state) && - ((((zcbor_bool_decode(state, (&(*result)))))) || - (zcbor_list_map_end_force_decode(state), false)) && - zcbor_list_end_decode(state)))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((zcbor_list_start_decode(state) && + ((((zcbor_bool_decode(state, (&(*result)))))) || + (zcbor_list_map_end_force_decode(state), false)) && + zcbor_list_end_decode(state)))); - return tmp_result; + log_result(state, res, __func__); + return res; } int cbor_decode_reset_evt_sub_req(const uint8_t *payload, size_t payload_len, bool *result, diff --git a/subsys/sdfw_services/services/reset_evt/zcbor_generated/reset_evt_service_decode.h b/subsys/sdfw_services/services/reset_evt/zcbor_generated/reset_evt_service_decode.h index 73ebfb26e965..6d544030bebe 100644 --- a/subsys/sdfw_services/services/reset_evt/zcbor_generated/reset_evt_service_decode.h +++ b/subsys/sdfw_services/services/reset_evt/zcbor_generated/reset_evt_service_decode.h @@ -1,11 +1,11 @@ /* - * Copyright (c) 2024 Nordic Semiconductor ASA + * Copyright (c) 2025 Nordic Semiconductor ASA * * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ /* - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */ diff --git a/subsys/sdfw_services/services/reset_evt/zcbor_generated/reset_evt_service_encode.c b/subsys/sdfw_services/services/reset_evt/zcbor_generated/reset_evt_service_encode.c index f3d096c77f07..1cdcf8c5d652 100644 --- a/subsys/sdfw_services/services/reset_evt/zcbor_generated/reset_evt_service_encode.c +++ b/subsys/sdfw_services/services/reset_evt/zcbor_generated/reset_evt_service_encode.c @@ -1,11 +1,11 @@ /* - * Copyright (c) 2024 Nordic Semiconductor ASA + * Copyright (c) 2025 Nordic Semiconductor ASA * * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ /* - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */ @@ -22,6 +22,17 @@ #error "The type file was generated with a different default_max_qty than this file" #endif +#define log_result(state, result, func) \ + do { \ + if (!result) { \ + zcbor_trace_file(state); \ + zcbor_log("%s error: %s\r\n", func, \ + zcbor_error_str(zcbor_peek_error(state))); \ + } else { \ + zcbor_log("%s success\r\n", func); \ + } \ + } while (0) + static bool encode_reset_evt_notif(zcbor_state_t *state, const struct reset_evt_notif *input); static bool encode_reset_evt_sub_rsp(zcbor_state_t *state, const int32_t *input); static bool encode_reset_evt_sub_req(zcbor_state_t *state, const bool *input); @@ -30,59 +41,40 @@ static bool encode_reset_evt_notif(zcbor_state_t *state, const struct reset_evt_ { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((zcbor_list_start_encode(state, 2) && - ((((zcbor_uint32_encode(state, (&(*input).reset_evt_notif_domains)))) && - ((zcbor_uint32_encode(state, (&(*input).reset_evt_notif_delay_ms))))) || - (zcbor_list_map_end_force_encode(state), false)) && - zcbor_list_end_encode(state, 2)))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + bool res = (((zcbor_list_start_encode(state, 2) && + ((((zcbor_uint32_encode(state, (&(*input).reset_evt_notif_domains)))) && + ((zcbor_uint32_encode(state, (&(*input).reset_evt_notif_delay_ms))))) || + (zcbor_list_map_end_force_encode(state), false)) && + zcbor_list_end_encode(state, 2)))); + + log_result(state, res, __func__); + return res; } static bool encode_reset_evt_sub_rsp(zcbor_state_t *state, const int32_t *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = (((zcbor_list_start_encode(state, 1) && - ((((zcbor_int32_encode(state, (&(*input)))))) || - (zcbor_list_map_end_force_encode(state), false)) && - zcbor_list_end_encode(state, 1)))); + bool res = (((zcbor_list_start_encode(state, 1) && + ((((zcbor_int32_encode(state, (&(*input)))))) || + (zcbor_list_map_end_force_encode(state), false)) && + zcbor_list_end_encode(state, 1)))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_reset_evt_sub_req(zcbor_state_t *state, const bool *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = (((zcbor_list_start_encode(state, 1) && - ((((zcbor_bool_encode(state, (&(*input)))))) || - (zcbor_list_map_end_force_encode(state), false)) && - zcbor_list_end_encode(state, 1)))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((zcbor_list_start_encode(state, 1) && + ((((zcbor_bool_encode(state, (&(*input)))))) || + (zcbor_list_map_end_force_encode(state), false)) && + zcbor_list_end_encode(state, 1)))); - return tmp_result; + log_result(state, res, __func__); + return res; } int cbor_encode_reset_evt_sub_req(uint8_t *payload, size_t payload_len, const bool *input, diff --git a/subsys/sdfw_services/services/reset_evt/zcbor_generated/reset_evt_service_encode.h b/subsys/sdfw_services/services/reset_evt/zcbor_generated/reset_evt_service_encode.h index 5892b17ea8f5..a42e78921948 100644 --- a/subsys/sdfw_services/services/reset_evt/zcbor_generated/reset_evt_service_encode.h +++ b/subsys/sdfw_services/services/reset_evt/zcbor_generated/reset_evt_service_encode.h @@ -1,11 +1,11 @@ /* - * Copyright (c) 2024 Nordic Semiconductor ASA + * Copyright (c) 2025 Nordic Semiconductor ASA * * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ /* - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */ diff --git a/subsys/sdfw_services/services/reset_evt/zcbor_generated/reset_evt_service_types.h b/subsys/sdfw_services/services/reset_evt/zcbor_generated/reset_evt_service_types.h index e7b9b242189a..4b2501366e77 100644 --- a/subsys/sdfw_services/services/reset_evt/zcbor_generated/reset_evt_service_types.h +++ b/subsys/sdfw_services/services/reset_evt/zcbor_generated/reset_evt_service_types.h @@ -1,11 +1,11 @@ /* - * Copyright (c) 2024 Nordic Semiconductor ASA + * Copyright (c) 2025 Nordic Semiconductor ASA * * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ /* - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */ diff --git a/subsys/sdfw_services/services/sdfw_update/zcbor_generated/CMakeLists.txt b/subsys/sdfw_services/services/sdfw_update/zcbor_generated/CMakeLists.txt index 0f96d2b36685..8e8037b3fe80 100644 --- a/subsys/sdfw_services/services/sdfw_update/zcbor_generated/CMakeLists.txt +++ b/subsys/sdfw_services/services/sdfw_update/zcbor_generated/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2024 Nordic Semiconductor ASA +# Copyright (c) 2025 Nordic Semiconductor ASA # # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # diff --git a/subsys/sdfw_services/services/sdfw_update/zcbor_generated/sdfw_update_service_decode.c b/subsys/sdfw_services/services/sdfw_update/zcbor_generated/sdfw_update_service_decode.c index 25640e21ae7e..96f098ae82c2 100644 --- a/subsys/sdfw_services/services/sdfw_update/zcbor_generated/sdfw_update_service_decode.c +++ b/subsys/sdfw_services/services/sdfw_update/zcbor_generated/sdfw_update_service_decode.c @@ -1,11 +1,11 @@ /* - * Copyright (c) 2024 Nordic Semiconductor ASA + * Copyright (c) 2025 Nordic Semiconductor ASA * * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ /* - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */ @@ -22,6 +22,17 @@ #error "The type file was generated with a different default_max_qty than this file" #endif +#define log_result(state, result, func) \ + do { \ + if (!result) { \ + zcbor_trace_file(state); \ + zcbor_log("%s error: %s\r\n", func, \ + zcbor_error_str(zcbor_peek_error(state))); \ + } else { \ + zcbor_log("%s success\r\n", func); \ + } \ + } while (0) + static bool decode_sdfw_update_rsp(zcbor_state_t *state, int32_t *result); static bool decode_sdfw_update_req(zcbor_state_t *state, struct sdfw_update_req *result); @@ -29,26 +40,20 @@ static bool decode_sdfw_update_rsp(zcbor_state_t *state, int32_t *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = (((zcbor_list_start_decode(state) && - ((((zcbor_int32_decode(state, (&(*result)))))) || - (zcbor_list_map_end_force_decode(state), false)) && - zcbor_list_end_decode(state)))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((zcbor_list_start_decode(state) && + ((((zcbor_int32_decode(state, (&(*result)))))) || + (zcbor_list_map_end_force_decode(state), false)) && + zcbor_list_end_decode(state)))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_sdfw_update_req(zcbor_state_t *state, struct sdfw_update_req *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = ((( + bool res = ((( zcbor_list_start_decode(state) && ((((zcbor_uint32_decode(state, (&(*result).sdfw_update_req_tbs_addr)))) && ((zcbor_uint32_decode(state, (&(*result).sdfw_update_req_dl_max)))) && @@ -58,14 +63,8 @@ static bool decode_sdfw_update_req(zcbor_state_t *state, struct sdfw_update_req (zcbor_list_map_end_force_decode(state), false)) && zcbor_list_end_decode(state)))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } int cbor_decode_sdfw_update_req(const uint8_t *payload, size_t payload_len, diff --git a/subsys/sdfw_services/services/sdfw_update/zcbor_generated/sdfw_update_service_decode.h b/subsys/sdfw_services/services/sdfw_update/zcbor_generated/sdfw_update_service_decode.h index a869f949d749..8b9e0b405374 100644 --- a/subsys/sdfw_services/services/sdfw_update/zcbor_generated/sdfw_update_service_decode.h +++ b/subsys/sdfw_services/services/sdfw_update/zcbor_generated/sdfw_update_service_decode.h @@ -1,11 +1,11 @@ /* - * Copyright (c) 2024 Nordic Semiconductor ASA + * Copyright (c) 2025 Nordic Semiconductor ASA * * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ /* - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */ diff --git a/subsys/sdfw_services/services/sdfw_update/zcbor_generated/sdfw_update_service_encode.c b/subsys/sdfw_services/services/sdfw_update/zcbor_generated/sdfw_update_service_encode.c index be58fb2e1a5c..886236236faf 100644 --- a/subsys/sdfw_services/services/sdfw_update/zcbor_generated/sdfw_update_service_encode.c +++ b/subsys/sdfw_services/services/sdfw_update/zcbor_generated/sdfw_update_service_encode.c @@ -1,11 +1,11 @@ /* - * Copyright (c) 2024 Nordic Semiconductor ASA + * Copyright (c) 2025 Nordic Semiconductor ASA * * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ /* - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */ @@ -22,6 +22,17 @@ #error "The type file was generated with a different default_max_qty than this file" #endif +#define log_result(state, result, func) \ + do { \ + if (!result) { \ + zcbor_trace_file(state); \ + zcbor_log("%s error: %s\r\n", func, \ + zcbor_error_str(zcbor_peek_error(state))); \ + } else { \ + zcbor_log("%s success\r\n", func); \ + } \ + } while (0) + static bool encode_sdfw_update_rsp(zcbor_state_t *state, const int32_t *input); static bool encode_sdfw_update_req(zcbor_state_t *state, const struct sdfw_update_req *input); @@ -29,26 +40,20 @@ static bool encode_sdfw_update_rsp(zcbor_state_t *state, const int32_t *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = (((zcbor_list_start_encode(state, 1) && - ((((zcbor_int32_encode(state, (&(*input)))))) || - (zcbor_list_map_end_force_encode(state), false)) && - zcbor_list_end_encode(state, 1)))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((zcbor_list_start_encode(state, 1) && + ((((zcbor_int32_encode(state, (&(*input)))))) || + (zcbor_list_map_end_force_encode(state), false)) && + zcbor_list_end_encode(state, 1)))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_sdfw_update_req(zcbor_state_t *state, const struct sdfw_update_req *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = (( + bool res = (( (zcbor_list_start_encode(state, 5) && ((((zcbor_uint32_encode(state, (&(*input).sdfw_update_req_tbs_addr)))) && ((zcbor_uint32_encode(state, (&(*input).sdfw_update_req_dl_max)))) && @@ -58,14 +63,8 @@ static bool encode_sdfw_update_req(zcbor_state_t *state, const struct sdfw_updat (zcbor_list_map_end_force_encode(state), false)) && zcbor_list_end_encode(state, 5)))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } int cbor_encode_sdfw_update_req(uint8_t *payload, size_t payload_len, diff --git a/subsys/sdfw_services/services/sdfw_update/zcbor_generated/sdfw_update_service_encode.h b/subsys/sdfw_services/services/sdfw_update/zcbor_generated/sdfw_update_service_encode.h index 94f0d7b477f5..a4a0e12a0efc 100644 --- a/subsys/sdfw_services/services/sdfw_update/zcbor_generated/sdfw_update_service_encode.h +++ b/subsys/sdfw_services/services/sdfw_update/zcbor_generated/sdfw_update_service_encode.h @@ -1,11 +1,11 @@ /* - * Copyright (c) 2024 Nordic Semiconductor ASA + * Copyright (c) 2025 Nordic Semiconductor ASA * * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ /* - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */ diff --git a/subsys/sdfw_services/services/sdfw_update/zcbor_generated/sdfw_update_service_types.h b/subsys/sdfw_services/services/sdfw_update/zcbor_generated/sdfw_update_service_types.h index ecf3d6c40239..75b85a8ca2b8 100644 --- a/subsys/sdfw_services/services/sdfw_update/zcbor_generated/sdfw_update_service_types.h +++ b/subsys/sdfw_services/services/sdfw_update/zcbor_generated/sdfw_update_service_types.h @@ -1,11 +1,11 @@ /* - * Copyright (c) 2024 Nordic Semiconductor ASA + * Copyright (c) 2025 Nordic Semiconductor ASA * * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ /* - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */