edhoc 1.0.4 → 1.1.0

package/external/libedhoc/backends/cbor/src/backend_cbor_message_error_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,43 +10,52 @@
 #include <string.h>
 #include "zcbor_decode.h"
 #include "backend_cbor_message_error_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_message_error_ERR_INFO(zcbor_state_t *state, struct message_error_ERR_INFO_ *result);
+static bool decode_suites(zcbor_state_t *state, struct suites_r *result);
+static bool decode_repeated_message_error_ERR_INFO(zcbor_state_t *state, struct message_error_ERR_INFO_r *result);
 static bool decode_message_error(zcbor_state_t *state, struct message_error *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_message_error_ERR_INFO(
-		zcbor_state_t *state, struct message_error_ERR_INFO_ *result)
+		zcbor_state_t *state, struct message_error_ERR_INFO_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_tstr_decode(state, (&(*result)._message_error_ERR_INFO_tstr)))) && (((*result)._message_error_ERR_INFO_choice = _message_error_ERR_INFO_tstr), true))
-	|| (zcbor_union_elem_code(state) && (((decode_suites(state, (&(*result)._message_error_ERR_INFO__suites)))) && (((*result)._message_error_ERR_INFO_choice = _message_error_ERR_INFO__suites), true)))
-	|| (zcbor_union_elem_code(state) && (((zcbor_bool_expect(state, (true)))) && (((*result)._message_error_ERR_INFO_choice = _message_error_ERR_INFO_bool), true)))), zcbor_union_end_code(state), int_res))));
+	bool tmp_result = (((zcbor_union_start_code(state) && (int_res = ((((zcbor_tstr_decode(state, (&(*result).message_error_ERR_INFO_tstr)))) && (((*result).message_error_ERR_INFO_choice = message_error_ERR_INFO_tstr_c), true))
+	|| (zcbor_union_elem_code(state) && (((decode_suites(state, (&(*result).message_error_ERR_INFO_suites_m)))) && (((*result).message_error_ERR_INFO_choice = message_error_ERR_INFO_suites_m_c), true)))
+	|| (zcbor_union_elem_code(state) && (((zcbor_bool_expect(state, (true)))) && (((*result).message_error_ERR_INFO_choice = message_error_ERR_INFO_bool_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;
 }
@@ -54,13 +63,17 @@ static bool decode_repeated_message_error_ERR_INFO(
 static bool decode_message_error(
 		zcbor_state_t *state, struct message_error *result)
 {
-	zcbor_print("%s\r\n", __func__);
+	zcbor_log("%s\r\n", __func__);
 
-	bool tmp_result = (((((zcbor_int32_decode(state, (&(*result)._message_error_ERR_CODE))))
-	&& zcbor_present_decode(&((*result)._message_error_ERR_INFO_present), (zcbor_decoder_t *)decode_repeated_message_error_ERR_INFO, state, (&(*result)._message_error_ERR_INFO)))));
+	bool tmp_result = (((((zcbor_int32_decode(state, (&(*result).message_error_ERR_CODE))))
+	&& zcbor_present_decode(&((*result).message_error_ERR_INFO_present), (zcbor_decoder_t *)decode_repeated_message_error_ERR_INFO, state, (&(*result).message_error_ERR_INFO)))));
 
-	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;
 }
@@ -74,20 +87,6 @@ int cbor_decode_message_error(
 {
 	zcbor_state_t states[5];
 
-	zcbor_new_state(states, sizeof(states) / sizeof(zcbor_state_t), payload, payload_len, 2);
-
-	bool ret = decode_message_error(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_error, sizeof(states) / sizeof(zcbor_state_t), 2);
 }

package/external/libedhoc/backends/cbor/src/backend_cbor_message_error_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,43 +10,52 @@
 #include <string.h>
 #include "zcbor_encode.h"
 #include "backend_cbor_message_error_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_message_error_ERR_INFO(zcbor_state_t *state, const struct message_error_ERR_INFO_ *input);
+static bool encode_suites(zcbor_state_t *state, const struct suites_r *input);
+static bool encode_repeated_message_error_ERR_INFO(zcbor_state_t *state, const struct message_error_ERR_INFO_r *input);
 static bool encode_message_error(zcbor_state_t *state, const struct message_error *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_message_error_ERR_INFO(
-		zcbor_state_t *state, const struct message_error_ERR_INFO_ *input)
+		zcbor_state_t *state, const struct message_error_ERR_INFO_r *input)
 {
-	zcbor_print("%s\r\n", __func__);
+	zcbor_log("%s\r\n", __func__);
 
-	bool tmp_result = (((((*input)._message_error_ERR_INFO_choice == _message_error_ERR_INFO_tstr) ? ((zcbor_tstr_encode(state, (&(*input)._message_error_ERR_INFO_tstr))))
-	: (((*input)._message_error_ERR_INFO_choice == _message_error_ERR_INFO__suites) ? ((encode_suites(state, (&(*input)._message_error_ERR_INFO__suites))))
-	: (((*input)._message_error_ERR_INFO_choice == _message_error_ERR_INFO_bool) ? ((zcbor_bool_put(state, (true))))
+	bool tmp_result = (((((*input).message_error_ERR_INFO_choice == message_error_ERR_INFO_tstr_c) ? ((zcbor_tstr_encode(state, (&(*input).message_error_ERR_INFO_tstr))))
+	: (((*input).message_error_ERR_INFO_choice == message_error_ERR_INFO_suites_m_c) ? ((encode_suites(state, (&(*input).message_error_ERR_INFO_suites_m))))
+	: (((*input).message_error_ERR_INFO_choice == message_error_ERR_INFO_bool_c) ? ((zcbor_bool_put(state, (true))))
 	: 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;
 }
@@ -54,13 +63,17 @@ static bool encode_repeated_message_error_ERR_INFO(
 static bool encode_message_error(
 		zcbor_state_t *state, const struct message_error *input)
 {
-	zcbor_print("%s\r\n", __func__);
+	zcbor_log("%s\r\n", __func__);
 
-	bool tmp_result = (((((zcbor_int32_encode(state, (&(*input)._message_error_ERR_CODE))))
-	&& zcbor_present_encode(&((*input)._message_error_ERR_INFO_present), (zcbor_encoder_t *)encode_repeated_message_error_ERR_INFO, state, (&(*input)._message_error_ERR_INFO)))));
+	bool tmp_result = (((((zcbor_int32_encode(state, (&(*input).message_error_ERR_CODE))))
+	&& (!(*input).message_error_ERR_INFO_present || encode_repeated_message_error_ERR_INFO(state, (&(*input).message_error_ERR_INFO))))));
 
-	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;
 }
@@ -74,20 +87,6 @@ int cbor_encode_message_error(
 {
 	zcbor_state_t states[5];
 
-	zcbor_new_state(states, sizeof(states) / sizeof(zcbor_state_t), payload, payload_len, 2);
-
-	bool ret = encode_message_error(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_error, sizeof(states) / sizeof(zcbor_state_t), 2);
 }

package/external/libedhoc/backends/cbor/src/backend_cbor_plaintext_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,49 +10,58 @@
 #include <string.h>
 #include "zcbor_decode.h"
 #include "backend_cbor_plaintext_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"
 #endif
 
-static bool decode_repeated_map_kid(zcbor_state_t *state, struct map_kid_ *result);
-static bool decode_COSE_X509(zcbor_state_t *state, struct COSE_X509_ *result);
+static bool decode_repeated_map_kid(zcbor_state_t *state, struct map_kid_r *result);
+static bool decode_COSE_X509(zcbor_state_t *state, struct COSE_X509_r *result);
 static bool decode_repeated_map_x5chain(zcbor_state_t *state, struct map_x5chain *result);
 static bool decode_COSE_CertHash(zcbor_state_t *state, struct COSE_CertHash *result);
 static bool decode_repeated_map_x5t(zcbor_state_t *state, struct map_x5t *result);
 static bool decode_map(zcbor_state_t *state, struct map *result);
-static bool decode_repeated_ead_x(zcbor_state_t *state, struct ead_x *result);
-static bool decode_ead_x(zcbor_state_t *state, struct ead_x_ *result);
+static bool decode_ead_y(zcbor_state_t *state, struct ead_y *result);
+static bool decode_EAD_2(zcbor_state_t *state, struct EAD_2 *result);
 static bool decode_plaintext_2(zcbor_state_t *state, struct plaintext_2 *result);
 
 
 static bool decode_repeated_map_kid(
-		zcbor_state_t *state, struct map_kid_ *result)
+		zcbor_state_t *state, struct map_kid_r *result)
 {
-	zcbor_print("%s\r\n", __func__);
+	zcbor_log("%s\r\n", __func__);
 	bool int_res;
 
 	bool tmp_result = ((((zcbor_uint32_expect(state, (4))))
-	&& (zcbor_union_start_code(state) && (int_res = ((((zcbor_int32_decode(state, (&(*result)._map_kid_int)))) && (((*result)._map_kid_choice = _map_kid_int), true))
-	|| (((zcbor_bstr_decode(state, (&(*result)._map_kid_bstr)))) && (((*result)._map_kid_choice = _map_kid_bstr), true))), zcbor_union_end_code(state), int_res))));
-
-	if (!tmp_result)
-		zcbor_trace();
+	&& (zcbor_union_start_code(state) && (int_res = ((((zcbor_int32_decode(state, (&(*result).map_kid_int)))) && (((*result).map_kid_choice = map_kid_int_c), true))
+	|| (((zcbor_bstr_decode(state, (&(*result).map_kid_bstr)))) && (((*result).map_kid_choice = map_kid_bstr_c), true))), zcbor_union_end_code(state), int_res))));
+
+	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_COSE_X509(
-		zcbor_state_t *state, struct COSE_X509_ *result)
+		zcbor_state_t *state, struct COSE_X509_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_bstr_decode(state, (&(*result)._COSE_X509_bstr)))) && (((*result)._COSE_X509_choice = _COSE_X509_bstr), true))
-	|| (zcbor_union_elem_code(state) && (((zcbor_list_start_decode(state) && ((zcbor_multi_decode(2, 3, &(*result)._COSE_X509__certs_certs_count, (zcbor_decoder_t *)zcbor_bstr_decode, state, (&(*result)._COSE_X509__certs_certs), sizeof(struct zcbor_string))) || (zcbor_list_map_end_force_decode(state), false)) && zcbor_list_end_decode(state))) && (((*result)._COSE_X509_choice = _COSE_X509__certs), true)))), zcbor_union_end_code(state), int_res))));
+	bool tmp_result = (((zcbor_union_start_code(state) && (int_res = ((((zcbor_bstr_decode(state, (&(*result).COSE_X509_bstr)))) && (((*result).COSE_X509_choice = COSE_X509_bstr_c), true))
+	|| (zcbor_union_elem_code(state) && (((zcbor_list_start_decode(state) && ((zcbor_multi_decode(2, 3, &(*result).COSE_X509_certs_l_certs_count, (zcbor_decoder_t *)zcbor_bstr_decode, state, (&(*result).COSE_X509_certs_l_certs), sizeof(struct zcbor_string))) || (zcbor_list_map_end_force_decode(state), false)) && zcbor_list_end_decode(state))) && (((*result).COSE_X509_choice = COSE_X509_certs_l_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;
 }
@@ -60,13 +69,17 @@ static bool decode_COSE_X509(
 static bool decode_repeated_map_x5chain(
 		zcbor_state_t *state, struct map_x5chain *result)
 {
-	zcbor_print("%s\r\n", __func__);
+	zcbor_log("%s\r\n", __func__);
 
 	bool tmp_result = ((((zcbor_uint32_expect(state, (33))))
-	&& (decode_COSE_X509(state, (&(*result)._map_x5chain)))));
+	&& (decode_COSE_X509(state, (&(*result).map_x5chain)))));
 
-	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;
 }
@@ -74,15 +87,19 @@ static bool decode_repeated_map_x5chain(
 static bool decode_COSE_CertHash(
 		zcbor_state_t *state, struct COSE_CertHash *result)
 {
-	zcbor_print("%s\r\n", __func__);
+	zcbor_log("%s\r\n", __func__);
 	bool int_res;
 
-	bool tmp_result = (((zcbor_list_start_decode(state) && ((((zcbor_union_start_code(state) && (int_res = ((((zcbor_int32_decode(state, (&(*result)._COSE_CertHash_hashAlg_int)))) && (((*result)._COSE_CertHash_hashAlg_choice = _COSE_CertHash_hashAlg_int), true))
-	|| (((zcbor_tstr_decode(state, (&(*result)._COSE_CertHash_hashAlg_tstr)))) && (((*result)._COSE_CertHash_hashAlg_choice = _COSE_CertHash_hashAlg_tstr), true))), zcbor_union_end_code(state), int_res)))
-	&& ((zcbor_bstr_decode(state, (&(*result)._COSE_CertHash_hashValue))))) || (zcbor_list_map_end_force_decode(state), false)) && zcbor_list_end_decode(state))));
+	bool tmp_result = (((zcbor_list_start_decode(state) && ((((zcbor_union_start_code(state) && (int_res = ((((zcbor_int32_decode(state, (&(*result).COSE_CertHash_hashAlg_int)))) && (((*result).COSE_CertHash_hashAlg_choice = COSE_CertHash_hashAlg_int_c), true))
+	|| (((zcbor_tstr_decode(state, (&(*result).COSE_CertHash_hashAlg_tstr)))) && (((*result).COSE_CertHash_hashAlg_choice = COSE_CertHash_hashAlg_tstr_c), true))), zcbor_union_end_code(state), int_res)))
+	&& ((zcbor_bstr_decode(state, (&(*result).COSE_CertHash_hashValue))))) || (zcbor_list_map_end_force_decode(state), false)) && zcbor_list_end_decode(state))));
 
-	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;
 }
@@ -90,13 +107,17 @@ static bool decode_COSE_CertHash(
 static bool decode_repeated_map_x5t(
 		zcbor_state_t *state, struct map_x5t *result)
 {
-	zcbor_print("%s\r\n", __func__);
+	zcbor_log("%s\r\n", __func__);
 
 	bool tmp_result = ((((zcbor_uint32_expect(state, (34))))
-	&& (decode_COSE_CertHash(state, (&(*result)._map_x5t)))));
+	&& (decode_COSE_CertHash(state, (&(*result).map_x5t)))));
 
-	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;
 }
@@ -104,41 +125,53 @@ static bool decode_repeated_map_x5t(
 static bool decode_map(
 		zcbor_state_t *state, struct map *result)
 {
-	zcbor_print("%s\r\n", __func__);
+	zcbor_log("%s\r\n", __func__);
 
-	bool tmp_result = (((zcbor_map_start_decode(state) && ((zcbor_present_decode(&((*result)._map_kid_present), (zcbor_decoder_t *)decode_repeated_map_kid, state, (&(*result)._map_kid))
-	&& zcbor_present_decode(&((*result)._map_x5chain_present), (zcbor_decoder_t *)decode_repeated_map_x5chain, state, (&(*result)._map_x5chain))
-	&& zcbor_present_decode(&((*result)._map_x5t_present), (zcbor_decoder_t *)decode_repeated_map_x5t, state, (&(*result)._map_x5t))) || (zcbor_list_map_end_force_decode(state), false)) && zcbor_map_end_decode(state))));
+	bool tmp_result = (((zcbor_map_start_decode(state) && ((zcbor_present_decode(&((*result).map_kid_present), (zcbor_decoder_t *)decode_repeated_map_kid, state, (&(*result).map_kid))
+	&& zcbor_present_decode(&((*result).map_x5chain_present), (zcbor_decoder_t *)decode_repeated_map_x5chain, state, (&(*result).map_x5chain))
+	&& zcbor_present_decode(&((*result).map_x5t_present), (zcbor_decoder_t *)decode_repeated_map_x5t, state, (&(*result).map_x5t))) || (zcbor_list_map_end_force_decode(state), false)) && zcbor_map_end_decode(state))));
 
-	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_x(
-		zcbor_state_t *state, struct ead_x *result)
+static bool decode_ead_y(
+		zcbor_state_t *state, struct ead_y *result)
 {
-	zcbor_print("%s\r\n", __func__);
+	zcbor_log("%s\r\n", __func__);
 
-	bool tmp_result = (((((zcbor_int32_decode(state, (&(*result)._ead_x_ead_label))))
-	&& zcbor_present_decode(&((*result)._ead_x_ead_value_present), (zcbor_decoder_t *)zcbor_bstr_decode, state, (&(*result)._ead_x_ead_value)))));
+	bool tmp_result = (((((zcbor_int32_decode(state, (&(*result).ead_y_ead_label))))
+	&& ((*result).ead_y_ead_value_present = ((zcbor_bstr_decode(state, (&(*result).ead_y_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_x(
-		zcbor_state_t *state, struct ead_x_ *result)
+static bool decode_EAD_2(
+		zcbor_state_t *state, struct EAD_2 *result)
 {
-	zcbor_print("%s\r\n", __func__);
+	zcbor_log("%s\r\n", __func__);
 
-	bool tmp_result = (zcbor_multi_decode(1, 3, &(*result)._ead_x_count, (zcbor_decoder_t *)decode_repeated_ead_x, state, (&(*result)._ead_x), sizeof(struct ead_x)));
+	bool tmp_result = (zcbor_multi_decode(1, 3, &(*result).EAD_2_count, (zcbor_decoder_t *)decode_ead_y, state, (&(*result).EAD_2), sizeof(struct ead_y)));
 
-	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;
 }
@@ -146,21 +179,25 @@ static bool decode_ead_x(
 static bool decode_plaintext_2(
 		zcbor_state_t *state, struct plaintext_2 *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_bstr_decode(state, (&(*result)._plaintext_2_C_R_bstr)))) && (((*result)._plaintext_2_C_R_choice = _plaintext_2_C_R_bstr), true))
-	|| (((zcbor_int32_decode(state, (&(*result)._plaintext_2_C_R_int)))
-	&& ((((*result)._plaintext_2_C_R_int >= -24)
-	&& ((*result)._plaintext_2_C_R_int <= 23)) || (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))) && (((*result)._plaintext_2_C_R_choice = _plaintext_2_C_R_int), true))), zcbor_union_end_code(state), int_res)))
-	&& ((zcbor_union_start_code(state) && (int_res = ((((zcbor_int32_decode(state, (&(*result)._plaintext_2_ID_CRED_R_int)))) && (((*result)._plaintext_2_ID_CRED_R_choice = _plaintext_2_ID_CRED_R_int), true))
-	|| (((zcbor_bstr_decode(state, (&(*result)._plaintext_2_ID_CRED_R_bstr)))) && (((*result)._plaintext_2_ID_CRED_R_choice = _plaintext_2_ID_CRED_R_bstr), true))
-	|| (zcbor_union_elem_code(state) && (((decode_map(state, (&(*result)._plaintext_2_ID_CRED_R__map)))) && (((*result)._plaintext_2_ID_CRED_R_choice = _plaintext_2_ID_CRED_R__map), true)))), zcbor_union_end_code(state), int_res)))
-	&& ((zcbor_bstr_decode(state, (&(*result)._plaintext_2_Signature_or_MAC_2))))
-	&& zcbor_present_decode(&((*result)._plaintext_2_EAD_2_present), (zcbor_decoder_t *)decode_ead_x, state, (&(*result)._plaintext_2_EAD_2)))));
-
-	if (!tmp_result)
-		zcbor_trace();
+	bool tmp_result = (((((zcbor_union_start_code(state) && (int_res = ((((zcbor_bstr_decode(state, (&(*result).plaintext_2_C_R_bstr)))) && (((*result).plaintext_2_C_R_choice = plaintext_2_C_R_bstr_c), true))
+	|| (((zcbor_int32_decode(state, (&(*result).plaintext_2_C_R_int)))
+	&& ((((*result).plaintext_2_C_R_int >= -24)
+	&& ((*result).plaintext_2_C_R_int <= 23)) || (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))) && (((*result).plaintext_2_C_R_choice = plaintext_2_C_R_int_c), true))), zcbor_union_end_code(state), int_res)))
+	&& ((zcbor_union_start_code(state) && (int_res = ((((zcbor_int32_decode(state, (&(*result).plaintext_2_ID_CRED_R_int)))) && (((*result).plaintext_2_ID_CRED_R_choice = plaintext_2_ID_CRED_R_int_c), true))
+	|| (((zcbor_bstr_decode(state, (&(*result).plaintext_2_ID_CRED_R_bstr)))) && (((*result).plaintext_2_ID_CRED_R_choice = plaintext_2_ID_CRED_R_bstr_c), true))
+	|| (zcbor_union_elem_code(state) && (((decode_map(state, (&(*result).plaintext_2_ID_CRED_R_map_m)))) && (((*result).plaintext_2_ID_CRED_R_choice = plaintext_2_ID_CRED_R_map_m_c), true)))), zcbor_union_end_code(state), int_res)))
+	&& ((zcbor_bstr_decode(state, (&(*result).plaintext_2_Signature_or_MAC_2))))
+	&& ((*result).plaintext_2_EAD_2_m_present = ((decode_EAD_2(state, (&(*result).plaintext_2_EAD_2_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;
 }
@@ -174,20 +211,6 @@ int cbor_decode_plaintext_2(
 {
 	zcbor_state_t states[6];
 
-	zcbor_new_state(states, sizeof(states) / sizeof(zcbor_state_t), payload, payload_len, 9);
-
-	bool ret = decode_plaintext_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_plaintext_2, sizeof(states) / sizeof(zcbor_state_t), 9);
 }