edhoc 1.0.4 → 1.1.0

package/external/libedhoc/backends/cbor/src/backend_cbor_message_1_decode.c

@@ -1,5 +1,5 @@
 /*
- * Generated using zcbor version 0.7.0
+ * Generated using zcbor version 0.8.1
  * https://github.com/NordicSemiconductor/zcbor
  * Generated with a --default-max-qty of 3
  */
@@ -10,55 +10,68 @@
 #include <string.h>
 #include "zcbor_decode.h"
 #include "backend_cbor_message_1_decode.h"
+#include "zcbor_print.h"
 
 #if DEFAULT_MAX_QTY != 3
 #error "The type file was generated with a different default_max_qty than this file"
 #endif
 
-static bool decode_suites(zcbor_state_t *state, struct suites_ *result);
-static bool decode_repeated_ead(zcbor_state_t *state, struct ead *result);
-static bool decode_ead(zcbor_state_t *state, struct ead_ *result);
+static bool decode_suites(zcbor_state_t *state, struct suites_r *result);
+static bool decode_ead_x(zcbor_state_t *state, struct ead_x *result);
+static bool decode_EAD_1(zcbor_state_t *state, struct EAD_1 *result);
 static bool decode_message_1(zcbor_state_t *state, struct message_1 *result);
 
 
 static bool decode_suites(
-		zcbor_state_t *state, struct suites_ *result)
+		zcbor_state_t *state, struct suites_r *result)
 {
-	zcbor_print("%s\r\n", __func__);
+	zcbor_log("%s\r\n", __func__);
 	bool int_res;
 
-	bool tmp_result = (((zcbor_union_start_code(state) && (int_res = ((((zcbor_list_start_decode(state) && ((zcbor_multi_decode(2, 3, &(*result)._suites__int_int_count, (zcbor_decoder_t *)zcbor_int32_decode, state, (&(*result)._suites__int_int), sizeof(int32_t))) || (zcbor_list_map_end_force_decode(state), false)) && zcbor_list_end_decode(state))) && (((*result)._suites_choice = _suites__int), true))
-	|| (zcbor_union_elem_code(state) && (((zcbor_int32_decode(state, (&(*result)._suites_int)))) && (((*result)._suites_choice = _suites_int), true)))), zcbor_union_end_code(state), int_res))));
+	bool tmp_result = (((zcbor_union_start_code(state) && (int_res = ((((zcbor_list_start_decode(state) && ((zcbor_multi_decode(2, 3, &(*result).suites_int_l_int_count, (zcbor_decoder_t *)zcbor_int32_decode, state, (&(*result).suites_int_l_int), sizeof(int32_t))) || (zcbor_list_map_end_force_decode(state), false)) && zcbor_list_end_decode(state))) && (((*result).suites_choice = suites_int_l_c), true))
+	|| (zcbor_union_elem_code(state) && (((zcbor_int32_decode(state, (&(*result).suites_int)))) && (((*result).suites_choice = suites_int_c), true)))), zcbor_union_end_code(state), int_res))));
 
-	if (!tmp_result)
-		zcbor_trace();
+	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;
 }
 
-static bool decode_repeated_ead(
-		zcbor_state_t *state, struct ead *result)
+static bool decode_ead_x(
+		zcbor_state_t *state, struct ead_x *result)
 {
-	zcbor_print("%s\r\n", __func__);
+	zcbor_log("%s\r\n", __func__);
 
-	bool tmp_result = (((((zcbor_int32_decode(state, (&(*result)._ead_label))))
-	&& zcbor_present_decode(&((*result)._ead_value_present), (zcbor_decoder_t *)zcbor_bstr_decode, state, (&(*result)._ead_value)))));
+	bool tmp_result = (((((zcbor_int32_decode(state, (&(*result).ead_x_ead_label))))
+	&& ((*result).ead_x_ead_value_present = ((zcbor_bstr_decode(state, (&(*result).ead_x_ead_value)))), 1))));
 
-	if (!tmp_result)
-		zcbor_trace();
+	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;
 }
 
-static bool decode_ead(
-		zcbor_state_t *state, struct ead_ *result)
+static bool decode_EAD_1(
+		zcbor_state_t *state, struct EAD_1 *result)
 {
-	zcbor_print("%s\r\n", __func__);
+	zcbor_log("%s\r\n", __func__);
 
-	bool tmp_result = (zcbor_multi_decode(1, 3, &(*result)._ead_count, (zcbor_decoder_t *)decode_repeated_ead, state, (&(*result)._ead), sizeof(struct ead)));
+	bool tmp_result = (zcbor_multi_decode(1, 3, &(*result).EAD_1_count, (zcbor_decoder_t *)decode_ead_x, state, (&(*result).EAD_1), sizeof(struct ead_x)));
 
-	if (!tmp_result)
-		zcbor_trace();
+	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;
 }
@@ -66,20 +79,24 @@ static bool decode_ead(
 static bool decode_message_1(
 		zcbor_state_t *state, struct message_1 *result)
 {
-	zcbor_print("%s\r\n", __func__);
+	zcbor_log("%s\r\n", __func__);
 	bool int_res;
 
-	bool tmp_result = (((((zcbor_int32_decode(state, (&(*result)._message_1_METHOD))))
-	&& ((decode_suites(state, (&(*result)._message_1_SUITES_I))))
-	&& ((zcbor_bstr_decode(state, (&(*result)._message_1_G_X))))
-	&& ((zcbor_union_start_code(state) && (int_res = ((((zcbor_bstr_decode(state, (&(*result)._message_1_C_I_bstr)))) && (((*result)._message_1_C_I_choice = _message_1_C_I_bstr), true))
-	|| (((zcbor_int32_decode(state, (&(*result)._message_1_C_I_int)))
-	&& ((((*result)._message_1_C_I_int >= -24)
-	&& ((*result)._message_1_C_I_int <= 23)) || (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))) && (((*result)._message_1_C_I_choice = _message_1_C_I_int), true))), zcbor_union_end_code(state), int_res)))
-	&& zcbor_present_decode(&((*result)._message_1_EAD_1_present), (zcbor_decoder_t *)decode_ead, state, (&(*result)._message_1_EAD_1)))));
-
-	if (!tmp_result)
-		zcbor_trace();
+	bool tmp_result = (((((zcbor_int32_decode(state, (&(*result).message_1_METHOD))))
+	&& ((decode_suites(state, (&(*result).message_1_SUITES_I))))
+	&& ((zcbor_bstr_decode(state, (&(*result).message_1_G_X))))
+	&& ((zcbor_union_start_code(state) && (int_res = ((((zcbor_bstr_decode(state, (&(*result).message_1_C_I_bstr)))) && (((*result).message_1_C_I_choice = message_1_C_I_bstr_c), true))
+	|| (((zcbor_int32_decode(state, (&(*result).message_1_C_I_int)))
+	&& ((((*result).message_1_C_I_int >= -24)
+	&& ((*result).message_1_C_I_int <= 23)) || (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))) && (((*result).message_1_C_I_choice = message_1_C_I_int_c), true))), zcbor_union_end_code(state), int_res)))
+	&& ((*result).message_1_EAD_1_m_present = ((decode_EAD_1(state, (&(*result).message_1_EAD_1_m)))), 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;
 }
@@ -93,20 +110,6 @@ int cbor_decode_message_1(
 {
 	zcbor_state_t states[4];
 
-	zcbor_new_state(states, sizeof(states) / sizeof(zcbor_state_t), payload, payload_len, 10);
-
-	bool ret = decode_message_1(states, result);
-
-	if (ret && (payload_len_out != NULL)) {
-		*payload_len_out = MIN(payload_len,
-				(size_t)states[0].payload - (size_t)payload);
-	}
-
-	if (!ret) {
-		int err = zcbor_pop_error(states);
-
-		zcbor_print("Return error: %d\r\n", err);
-		return (err == ZCBOR_SUCCESS) ? ZCBOR_ERR_UNKNOWN : err;
-	}
-	return ZCBOR_SUCCESS;
+	return zcbor_entry_function(payload, payload_len, (void *)result, payload_len_out, states,
+		(zcbor_decoder_t *)decode_message_1, sizeof(states) / sizeof(zcbor_state_t), 10);
 }

package/external/libedhoc/backends/cbor/src/backend_cbor_message_1_encode.c

@@ -1,5 +1,5 @@
 /*
- * Generated using zcbor version 0.7.0
+ * Generated using zcbor version 0.8.1
  * https://github.com/NordicSemiconductor/zcbor
  * Generated with a --default-max-qty of 3
  */
@@ -10,55 +10,68 @@
 #include <string.h>
 #include "zcbor_encode.h"
 #include "backend_cbor_message_1_encode.h"
+#include "zcbor_print.h"
 
 #if DEFAULT_MAX_QTY != 3
 #error "The type file was generated with a different default_max_qty than this file"
 #endif
 
-static bool encode_suites(zcbor_state_t *state, const struct suites_ *input);
-static bool encode_repeated_ead(zcbor_state_t *state, const struct ead *input);
-static bool encode_ead(zcbor_state_t *state, const struct ead_ *input);
+static bool encode_suites(zcbor_state_t *state, const struct suites_r *input);
+static bool encode_ead_x(zcbor_state_t *state, const struct ead_x *input);
+static bool encode_EAD_1(zcbor_state_t *state, const struct EAD_1 *input);
 static bool encode_message_1(zcbor_state_t *state, const struct message_1 *input);
 
 
 static bool encode_suites(
-		zcbor_state_t *state, const struct suites_ *input)
+		zcbor_state_t *state, const struct suites_r *input)
 {
-	zcbor_print("%s\r\n", __func__);
+	zcbor_log("%s\r\n", __func__);
 
-	bool tmp_result = (((((*input)._suites_choice == _suites__int) ? ((zcbor_list_start_encode(state, 3) && ((zcbor_multi_encode_minmax(2, 3, &(*input)._suites__int_int_count, (zcbor_encoder_t *)zcbor_int32_encode, state, (&(*input)._suites__int_int), sizeof(int32_t))) || (zcbor_list_map_end_force_encode(state), false)) && zcbor_list_end_encode(state, 3)))
-	: (((*input)._suites_choice == _suites_int) ? ((zcbor_int32_encode(state, (&(*input)._suites_int))))
+	bool tmp_result = (((((*input).suites_choice == suites_int_l_c) ? ((zcbor_list_start_encode(state, 3) && ((zcbor_multi_encode_minmax(2, 3, &(*input).suites_int_l_int_count, (zcbor_encoder_t *)zcbor_int32_encode, state, (&(*input).suites_int_l_int), sizeof(int32_t))) || (zcbor_list_map_end_force_encode(state), false)) && zcbor_list_end_encode(state, 3)))
+	: (((*input).suites_choice == suites_int_c) ? ((zcbor_int32_encode(state, (&(*input).suites_int))))
 	: false))));
 
-	if (!tmp_result)
-		zcbor_trace();
+	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;
 }
 
-static bool encode_repeated_ead(
-		zcbor_state_t *state, const struct ead *input)
+static bool encode_ead_x(
+		zcbor_state_t *state, const struct ead_x *input)
 {
-	zcbor_print("%s\r\n", __func__);
+	zcbor_log("%s\r\n", __func__);
 
-	bool tmp_result = (((((zcbor_int32_encode(state, (&(*input)._ead_label))))
-	&& zcbor_present_encode(&((*input)._ead_value_present), (zcbor_encoder_t *)zcbor_bstr_encode, state, (&(*input)._ead_value)))));
+	bool tmp_result = (((((zcbor_int32_encode(state, (&(*input).ead_x_ead_label))))
+	&& (!(*input).ead_x_ead_value_present || zcbor_bstr_encode(state, (&(*input).ead_x_ead_value))))));
 
-	if (!tmp_result)
-		zcbor_trace();
+	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;
 }
 
-static bool encode_ead(
-		zcbor_state_t *state, const struct ead_ *input)
+static bool encode_EAD_1(
+		zcbor_state_t *state, const struct EAD_1 *input)
 {
-	zcbor_print("%s\r\n", __func__);
+	zcbor_log("%s\r\n", __func__);
 
-	bool tmp_result = (zcbor_multi_encode_minmax(1, 3, &(*input)._ead_count, (zcbor_encoder_t *)encode_repeated_ead, state, (&(*input)._ead), sizeof(struct ead)));
+	bool tmp_result = (zcbor_multi_encode_minmax(1, 3, &(*input).EAD_1_count, (zcbor_encoder_t *)encode_ead_x, state, (&(*input).EAD_1), sizeof(struct ead_x)));
 
-	if (!tmp_result)
-		zcbor_trace();
+	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;
 }
@@ -66,20 +79,24 @@ static bool encode_ead(
 static bool encode_message_1(
 		zcbor_state_t *state, const struct message_1 *input)
 {
-	zcbor_print("%s\r\n", __func__);
-
-	bool tmp_result = (((((zcbor_int32_encode(state, (&(*input)._message_1_METHOD))))
-	&& ((encode_suites(state, (&(*input)._message_1_SUITES_I))))
-	&& ((zcbor_bstr_encode(state, (&(*input)._message_1_G_X))))
-	&& ((((*input)._message_1_C_I_choice == _message_1_C_I_bstr) ? ((zcbor_bstr_encode(state, (&(*input)._message_1_C_I_bstr))))
-	: (((*input)._message_1_C_I_choice == _message_1_C_I_int) ? (((((*input)._message_1_C_I_int >= -24)
-	&& ((*input)._message_1_C_I_int <= 23)) || (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))
-	&& (zcbor_int32_encode(state, (&(*input)._message_1_C_I_int))))
+	zcbor_log("%s\r\n", __func__);
+
+	bool tmp_result = (((((zcbor_int32_encode(state, (&(*input).message_1_METHOD))))
+	&& ((encode_suites(state, (&(*input).message_1_SUITES_I))))
+	&& ((zcbor_bstr_encode(state, (&(*input).message_1_G_X))))
+	&& ((((*input).message_1_C_I_choice == message_1_C_I_bstr_c) ? ((zcbor_bstr_encode(state, (&(*input).message_1_C_I_bstr))))
+	: (((*input).message_1_C_I_choice == message_1_C_I_int_c) ? (((((*input).message_1_C_I_int >= -24)
+	&& ((*input).message_1_C_I_int <= 23)) || (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))
+	&& (zcbor_int32_encode(state, (&(*input).message_1_C_I_int))))
 	: false)))
-	&& zcbor_present_encode(&((*input)._message_1_EAD_1_present), (zcbor_encoder_t *)encode_ead, state, (&(*input)._message_1_EAD_1)))));
+	&& (!(*input).message_1_EAD_1_m_present || encode_EAD_1(state, (&(*input).message_1_EAD_1_m))))));
 
-	if (!tmp_result)
-		zcbor_trace();
+	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;
 }
@@ -93,20 +110,6 @@ int cbor_encode_message_1(
 {
 	zcbor_state_t states[4];
 
-	zcbor_new_state(states, sizeof(states) / sizeof(zcbor_state_t), payload, payload_len, 10);
-
-	bool ret = encode_message_1(states, input);
-
-	if (ret && (payload_len_out != NULL)) {
-		*payload_len_out = MIN(payload_len,
-				(size_t)states[0].payload - (size_t)payload);
-	}
-
-	if (!ret) {
-		int err = zcbor_pop_error(states);
-
-		zcbor_print("Return error: %d\r\n", err);
-		return (err == ZCBOR_SUCCESS) ? ZCBOR_ERR_UNKNOWN : err;
-	}
-	return ZCBOR_SUCCESS;
+	return zcbor_entry_function(payload, payload_len, (void *)input, payload_len_out, states,
+		(zcbor_decoder_t *)encode_message_1, sizeof(states) / sizeof(zcbor_state_t), 10);
 }

package/external/libedhoc/backends/cbor/src/backend_cbor_message_2_decode.c

@@ -1,5 +1,5 @@
 /*
- * Generated using zcbor version 0.7.0
+ * Generated using zcbor version 0.8.1
  * https://github.com/NordicSemiconductor/zcbor
  * Generated with a --default-max-qty of 3
  */
@@ -10,6 +10,7 @@
 #include <string.h>
 #include "zcbor_decode.h"
 #include "backend_cbor_message_2_decode.h"
+#include "zcbor_print.h"
 
 #if DEFAULT_MAX_QTY != 3
 #error "The type file was generated with a different default_max_qty than this file"
@@ -21,12 +22,16 @@ static bool decode_message_2_G_Y_CIPHERTEXT_2(zcbor_state_t *state, struct zcbor
 static bool decode_message_2_G_Y_CIPHERTEXT_2(
 		zcbor_state_t *state, struct zcbor_string *result)
 {
-	zcbor_print("%s\r\n", __func__);
+	zcbor_log("%s\r\n", __func__);
 
 	bool tmp_result = (((zcbor_bstr_decode(state, (&(*result))))));
 
-	if (!tmp_result)
-		zcbor_trace();
+	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;
 }
@@ -40,20 +45,6 @@ int cbor_decode_message_2_G_Y_CIPHERTEXT_2(
 {
 	zcbor_state_t states[2];
 
-	zcbor_new_state(states, sizeof(states) / sizeof(zcbor_state_t), payload, payload_len, 1);
-
-	bool ret = decode_message_2_G_Y_CIPHERTEXT_2(states, result);
-
-	if (ret && (payload_len_out != NULL)) {
-		*payload_len_out = MIN(payload_len,
-				(size_t)states[0].payload - (size_t)payload);
-	}
-
-	if (!ret) {
-		int err = zcbor_pop_error(states);
-
-		zcbor_print("Return error: %d\r\n", err);
-		return (err == ZCBOR_SUCCESS) ? ZCBOR_ERR_UNKNOWN : err;
-	}
-	return ZCBOR_SUCCESS;
+	return zcbor_entry_function(payload, payload_len, (void *)result, payload_len_out, states,
+		(zcbor_decoder_t *)decode_message_2_G_Y_CIPHERTEXT_2, sizeof(states) / sizeof(zcbor_state_t), 1);
 }

package/external/libedhoc/backends/cbor/src/backend_cbor_message_2_encode.c

@@ -1,5 +1,5 @@
 /*
- * Generated using zcbor version 0.7.0
+ * Generated using zcbor version 0.8.1
  * https://github.com/NordicSemiconductor/zcbor
  * Generated with a --default-max-qty of 3
  */
@@ -10,6 +10,7 @@
 #include <string.h>
 #include "zcbor_encode.h"
 #include "backend_cbor_message_2_encode.h"
+#include "zcbor_print.h"
 
 #if DEFAULT_MAX_QTY != 3
 #error "The type file was generated with a different default_max_qty than this file"
@@ -21,12 +22,16 @@ static bool encode_message_2_G_Y_CIPHERTEXT_2(zcbor_state_t *state, const struct
 static bool encode_message_2_G_Y_CIPHERTEXT_2(
 		zcbor_state_t *state, const struct zcbor_string *input)
 {
-	zcbor_print("%s\r\n", __func__);
+	zcbor_log("%s\r\n", __func__);
 
 	bool tmp_result = (((zcbor_bstr_encode(state, (&(*input))))));
 
-	if (!tmp_result)
-		zcbor_trace();
+	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;
 }
@@ -40,20 +45,6 @@ int cbor_encode_message_2_G_Y_CIPHERTEXT_2(
 {
 	zcbor_state_t states[2];
 
-	zcbor_new_state(states, sizeof(states) / sizeof(zcbor_state_t), payload, payload_len, 1);
-
-	bool ret = encode_message_2_G_Y_CIPHERTEXT_2(states, input);
-
-	if (ret && (payload_len_out != NULL)) {
-		*payload_len_out = MIN(payload_len,
-				(size_t)states[0].payload - (size_t)payload);
-	}
-
-	if (!ret) {
-		int err = zcbor_pop_error(states);
-
-		zcbor_print("Return error: %d\r\n", err);
-		return (err == ZCBOR_SUCCESS) ? ZCBOR_ERR_UNKNOWN : err;
-	}
-	return ZCBOR_SUCCESS;
+	return zcbor_entry_function(payload, payload_len, (void *)input, payload_len_out, states,
+		(zcbor_decoder_t *)encode_message_2_G_Y_CIPHERTEXT_2, sizeof(states) / sizeof(zcbor_state_t), 1);
 }

package/external/libedhoc/backends/cbor/src/backend_cbor_message_3_decode.c

@@ -1,5 +1,5 @@
 /*
- * Generated using zcbor version 0.7.0
+ * Generated using zcbor version 0.8.1
  * https://github.com/NordicSemiconductor/zcbor
  * Generated with a --default-max-qty of 3
  */
@@ -10,6 +10,7 @@
 #include <string.h>
 #include "zcbor_decode.h"
 #include "backend_cbor_message_3_decode.h"
+#include "zcbor_print.h"
 
 #if DEFAULT_MAX_QTY != 3
 #error "The type file was generated with a different default_max_qty than this file"
@@ -21,12 +22,16 @@ static bool decode_message_3_CIPHERTEXT_3(zcbor_state_t *state, struct zcbor_str
 static bool decode_message_3_CIPHERTEXT_3(
 		zcbor_state_t *state, struct zcbor_string *result)
 {
-	zcbor_print("%s\r\n", __func__);
+	zcbor_log("%s\r\n", __func__);
 
 	bool tmp_result = (((zcbor_bstr_decode(state, (&(*result))))));
 
-	if (!tmp_result)
-		zcbor_trace();
+	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;
 }
@@ -40,20 +45,6 @@ int cbor_decode_message_3_CIPHERTEXT_3(
 {
 	zcbor_state_t states[2];
 
-	zcbor_new_state(states, sizeof(states) / sizeof(zcbor_state_t), payload, payload_len, 1);
-
-	bool ret = decode_message_3_CIPHERTEXT_3(states, result);
-
-	if (ret && (payload_len_out != NULL)) {
-		*payload_len_out = MIN(payload_len,
-				(size_t)states[0].payload - (size_t)payload);
-	}
-
-	if (!ret) {
-		int err = zcbor_pop_error(states);
-
-		zcbor_print("Return error: %d\r\n", err);
-		return (err == ZCBOR_SUCCESS) ? ZCBOR_ERR_UNKNOWN : err;
-	}
-	return ZCBOR_SUCCESS;
+	return zcbor_entry_function(payload, payload_len, (void *)result, payload_len_out, states,
+		(zcbor_decoder_t *)decode_message_3_CIPHERTEXT_3, sizeof(states) / sizeof(zcbor_state_t), 1);
 }

package/external/libedhoc/backends/cbor/src/backend_cbor_message_3_encode.c

@@ -1,5 +1,5 @@
 /*
- * Generated using zcbor version 0.7.0
+ * Generated using zcbor version 0.8.1
  * https://github.com/NordicSemiconductor/zcbor
  * Generated with a --default-max-qty of 3
  */
@@ -10,6 +10,7 @@
 #include <string.h>
 #include "zcbor_encode.h"
 #include "backend_cbor_message_3_encode.h"
+#include "zcbor_print.h"
 
 #if DEFAULT_MAX_QTY != 3
 #error "The type file was generated with a different default_max_qty than this file"
@@ -21,12 +22,16 @@ static bool encode_message_3_CIPHERTEXT_3(zcbor_state_t *state, const struct zcb
 static bool encode_message_3_CIPHERTEXT_3(
 		zcbor_state_t *state, const struct zcbor_string *input)
 {
-	zcbor_print("%s\r\n", __func__);
+	zcbor_log("%s\r\n", __func__);
 
 	bool tmp_result = (((zcbor_bstr_encode(state, (&(*input))))));
 
-	if (!tmp_result)
-		zcbor_trace();
+	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;
 }
@@ -40,20 +45,6 @@ int cbor_encode_message_3_CIPHERTEXT_3(
 {
 	zcbor_state_t states[2];
 
-	zcbor_new_state(states, sizeof(states) / sizeof(zcbor_state_t), payload, payload_len, 1);
-
-	bool ret = encode_message_3_CIPHERTEXT_3(states, input);
-
-	if (ret && (payload_len_out != NULL)) {
-		*payload_len_out = MIN(payload_len,
-				(size_t)states[0].payload - (size_t)payload);
-	}
-
-	if (!ret) {
-		int err = zcbor_pop_error(states);
-
-		zcbor_print("Return error: %d\r\n", err);
-		return (err == ZCBOR_SUCCESS) ? ZCBOR_ERR_UNKNOWN : err;
-	}
-	return ZCBOR_SUCCESS;
+	return zcbor_entry_function(payload, payload_len, (void *)input, payload_len_out, states,
+		(zcbor_decoder_t *)encode_message_3_CIPHERTEXT_3, sizeof(states) / sizeof(zcbor_state_t), 1);
 }

package/external/libedhoc/backends/cbor/src/backend_cbor_message_4_decode.c

@@ -1,5 +1,5 @@
 /*
- * Generated using zcbor version 0.7.0
+ * Generated using zcbor version 0.8.1
  * https://github.com/NordicSemiconductor/zcbor
  * Generated with a --default-max-qty of 3
  */
@@ -10,6 +10,7 @@
 #include <string.h>
 #include "zcbor_decode.h"
 #include "backend_cbor_message_4_decode.h"
+#include "zcbor_print.h"
 
 #if DEFAULT_MAX_QTY != 3
 #error "The type file was generated with a different default_max_qty than this file"
@@ -21,12 +22,16 @@ static bool decode_message_4_CIPHERTEXT_4(zcbor_state_t *state, struct zcbor_str
 static bool decode_message_4_CIPHERTEXT_4(
 		zcbor_state_t *state, struct zcbor_string *result)
 {
-	zcbor_print("%s\r\n", __func__);
+	zcbor_log("%s\r\n", __func__);
 
 	bool tmp_result = (((zcbor_bstr_decode(state, (&(*result))))));
 
-	if (!tmp_result)
-		zcbor_trace();
+	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;
 }
@@ -40,20 +45,6 @@ int cbor_decode_message_4_CIPHERTEXT_4(
 {
 	zcbor_state_t states[2];
 
-	zcbor_new_state(states, sizeof(states) / sizeof(zcbor_state_t), payload, payload_len, 1);
-
-	bool ret = decode_message_4_CIPHERTEXT_4(states, result);
-
-	if (ret && (payload_len_out != NULL)) {
-		*payload_len_out = MIN(payload_len,
-				(size_t)states[0].payload - (size_t)payload);
-	}
-
-	if (!ret) {
-		int err = zcbor_pop_error(states);
-
-		zcbor_print("Return error: %d\r\n", err);
-		return (err == ZCBOR_SUCCESS) ? ZCBOR_ERR_UNKNOWN : err;
-	}
-	return ZCBOR_SUCCESS;
+	return zcbor_entry_function(payload, payload_len, (void *)result, payload_len_out, states,
+		(zcbor_decoder_t *)decode_message_4_CIPHERTEXT_4, sizeof(states) / sizeof(zcbor_state_t), 1);
 }

package/external/libedhoc/backends/cbor/src/backend_cbor_message_4_encode.c

@@ -1,5 +1,5 @@
 /*
- * Generated using zcbor version 0.7.0
+ * Generated using zcbor version 0.8.1
  * https://github.com/NordicSemiconductor/zcbor
  * Generated with a --default-max-qty of 3
  */
@@ -10,6 +10,7 @@
 #include <string.h>
 #include "zcbor_encode.h"
 #include "backend_cbor_message_4_encode.h"
+#include "zcbor_print.h"
 
 #if DEFAULT_MAX_QTY != 3
 #error "The type file was generated with a different default_max_qty than this file"
@@ -21,12 +22,16 @@ static bool encode_message_4_CIPHERTEXT_4(zcbor_state_t *state, const struct zcb
 static bool encode_message_4_CIPHERTEXT_4(
 		zcbor_state_t *state, const struct zcbor_string *input)
 {
-	zcbor_print("%s\r\n", __func__);
+	zcbor_log("%s\r\n", __func__);
 
 	bool tmp_result = (((zcbor_bstr_encode(state, (&(*input))))));
 
-	if (!tmp_result)
-		zcbor_trace();
+	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;
 }
@@ -40,20 +45,6 @@ int cbor_encode_message_4_CIPHERTEXT_4(
 {
 	zcbor_state_t states[2];
 
-	zcbor_new_state(states, sizeof(states) / sizeof(zcbor_state_t), payload, payload_len, 1);
-
-	bool ret = encode_message_4_CIPHERTEXT_4(states, input);
-
-	if (ret && (payload_len_out != NULL)) {
-		*payload_len_out = MIN(payload_len,
-				(size_t)states[0].payload - (size_t)payload);
-	}
-
-	if (!ret) {
-		int err = zcbor_pop_error(states);
-
-		zcbor_print("Return error: %d\r\n", err);
-		return (err == ZCBOR_SUCCESS) ? ZCBOR_ERR_UNKNOWN : err;
-	}
-	return ZCBOR_SUCCESS;
+	return zcbor_entry_function(payload, payload_len, (void *)input, payload_len_out, states,
+		(zcbor_decoder_t *)encode_message_4_CIPHERTEXT_4, sizeof(states) / sizeof(zcbor_state_t), 1);
 }