edhoc 1.0.4 → 1.1.0

package/external/libedhoc/externals/zcbor/tests/decode/test1_suit_old_formats/src/main.c

@@ -7,7 +7,6 @@
 #include <zephyr/ztest.h>
 #include "manifest-moran3_decode.h"
 #include "manifest-moran4_decode.h"
-#include "zcbor_debug.h" // Enables use of print functions when debugging tests.
 
 
 uint8_t test_vector2[] = {
@@ -115,33 +114,33 @@ ZTEST(cbor_decode_test, test_1)
 			"test_vector2 failed");
 	zassert_equal(sizeof(test_vector2), decode_len, NULL);
 	zassert_equal(2, outerwrapper
-			._OuterWrapper_manifest_cbor
-			._Manifest_sequence,
-			"Sequence number incorrect (%d)", outerwrapper._OuterWrapper_manifest_cbor._Manifest_sequence);
+			.OuterWrapper_manifest_cbor
+			.Manifest_sequence,
+			"Sequence number incorrect (%d)", outerwrapper.OuterWrapper_manifest_cbor.Manifest_sequence);
 	zassert_true(outerwrapper
-			._OuterWrapper_manifest_cbor
-			._Manifest_payloads_present,
+			.OuterWrapper_manifest_cbor
+			.Manifest_payloads_present,
 			"Expected payloads entry");
 	zassert_equal(1, outerwrapper
-			._OuterWrapper_manifest_cbor
-			._Manifest_payloads_present,
+			.OuterWrapper_manifest_cbor
+			.Manifest_payloads_present,
 			"Expected payloads present");
 	zassert_equal(1, outerwrapper
-			._OuterWrapper_manifest_cbor
-			._Manifest_payloads
-			._Manifest_payloads__PayloadInfo_count,
+			.OuterWrapper_manifest_cbor
+			.Manifest_payloads
+			.Manifest_payloads_PayloadInfo_m_count,
 			"Expected single payloads entry, was %d",
 			outerwrapper
-			._OuterWrapper_manifest_cbor
-			._Manifest_payloads
-			._Manifest_payloads__PayloadInfo_count);
+			.OuterWrapper_manifest_cbor
+			.Manifest_payloads
+			.Manifest_payloads_PayloadInfo_m_count);
 	zassert_mem_equal(expected_tag,
 			outerwrapper
-			._OuterWrapper_manifest_cbor
-			._Manifest_payloads
-			._Manifest_payloads__PayloadInfo[0]
-			._PayloadInfo_payloadDigest
-			._COSE_Mac0_tag
+			.OuterWrapper_manifest_cbor
+			.Manifest_payloads
+			.Manifest_payloads_PayloadInfo_m[0]
+			.PayloadInfo_payloadDigest
+			.COSE_Mac0_tag
 			.value,
 			sizeof(expected_tag),
 			"Expected a certain payloads tag");
@@ -163,35 +162,35 @@ ZTEST(cbor_decode_test, test_2)
 			"test_vector3 failed");
 	zassert_equal(sizeof(test_vector3), decode_len, NULL);
 	zassert_equal(2, outerwrapper
-			._OuterWrapper_manifest_cbor
-			._Manifest_sequence,
-			"Sequence number incorrect (%d)", outerwrapper._OuterWrapper_manifest_cbor._Manifest_sequence);
+			.OuterWrapper_manifest_cbor
+			.Manifest_sequence,
+			"Sequence number incorrect (%d)", outerwrapper.OuterWrapper_manifest_cbor.Manifest_sequence);
 	zassert_equal(1, outerwrapper
-			._OuterWrapper_textExt_present,
+			.OuterWrapper_textExt_present,
 			"Expected text present");
 	zassert_equal(1, outerwrapper
-			._OuterWrapper_textExt
-			._OuterWrapper_textExt_cbor_count,
+			.OuterWrapper_textExt
+			.OuterWrapper_textExt_cbor_count,
 			"Expected single text entry");
 	zassert_equal(1, outerwrapper
-			._OuterWrapper_textExt
-			._OuterWrapper_textExt_cbor_count,
+			.OuterWrapper_textExt
+			.OuterWrapper_textExt_cbor_count,
 			"Expected single text entry");
 	zassert_equal(1, outerwrapper
-			._OuterWrapper_manifest_cbor
-			._Manifest_payloads
-			._Manifest_payloads__PayloadInfo_count,
+			.OuterWrapper_manifest_cbor
+			.Manifest_payloads
+			.Manifest_payloads_PayloadInfo_m_count,
 			"Expected single payloads entry, was %d",
 			outerwrapper
-			._OuterWrapper_manifest_cbor
-			._Manifest_payloads
-			._Manifest_payloads__PayloadInfo_count);
+			.OuterWrapper_manifest_cbor
+			.Manifest_payloads
+			.Manifest_payloads_PayloadInfo_m_count);
 	zassert_mem_equal(expected_updateDescription,
 			outerwrapper
-			._OuterWrapper_textExt
-			._OuterWrapper_textExt_cbor[0]
-			._Text_inttstr[0]
-			._Text_inttstr
+			.OuterWrapper_textExt
+			.OuterWrapper_textExt_cbor[0]
+			.Text_inttstr[0]
+			.Text_inttstr
 			.value,
 			sizeof(expected_updateDescription) - 1,
 			"Expected lorem ipsum text.");
@@ -208,159 +207,159 @@ ZTEST(cbor_decode_test, test_3)
 	zassert_equal(sizeof(test_vector4), decode_len, NULL);
 	zassert_equal(2,
 		      outerwrapper4
-		      ._SUIT_Outer_Wrapper_suit_manifest_cbor
-		      ._SUIT_Manifest_suit_manifest_sequence_number,
+		      .SUIT_Outer_Wrapper_suit_manifest_cbor
+		      .SUIT_Manifest_suit_manifest_sequence_number,
 		      "Sequence number incorrect");
 	zassert_equal(1,
 		      outerwrapper4
-		      ._SUIT_Outer_Wrapper_suit_manifest_cbor
-		      ._SUIT_Manifest_suit_install_present,
+		      .SUIT_Outer_Wrapper_suit_manifest_cbor
+		      .SUIT_Manifest_suit_install_present,
 		      "Expected install present");
-	zassert_equal(_SUIT_Severable_Command_Sequence3_SUIT_Command_Sequence_bstr,
+	zassert_equal(SUIT_Severable_Command_Sequence3_SUIT_Command_Sequence_bstr_c,
 		      outerwrapper4
-		      ._SUIT_Outer_Wrapper_suit_manifest_cbor
-		      ._SUIT_Manifest_suit_install
-		      ._SUIT_Manifest_suit_install
-		      ._SUIT_Severable_Command_Sequence3_choice,
+		      .SUIT_Outer_Wrapper_suit_manifest_cbor
+		      .SUIT_Manifest_suit_install
+		      .SUIT_Manifest_suit_install
+		      .SUIT_Severable_Command_Sequence3_choice,
 		      "Expected install present");
 	zassert_equal(3,
 		      outerwrapper4
-		      ._SUIT_Outer_Wrapper_suit_manifest_cbor
-		      ._SUIT_Manifest_suit_install
-		      ._SUIT_Manifest_suit_install
-		      ._SUIT_Severable_Command_Sequence3_SUIT_Command_Sequence_bstr_cbor
-		      ._SUIT_Command_Sequence__SUIT_Command_count,
+		      .SUIT_Outer_Wrapper_suit_manifest_cbor
+		      .SUIT_Manifest_suit_install
+		      .SUIT_Manifest_suit_install
+		      .SUIT_Severable_Command_Sequence3_SUIT_Command_Sequence_bstr_cbor
+		      .SUIT_Command_Sequence_SUIT_Command_m_count,
 		      "Expected x commands.");
-	zassert_equal(_SUIT_Command_union__SUIT_Directive,
+	zassert_equal(SUIT_Command_union_SUIT_Directive_m_c,
 		      outerwrapper4
-		      ._SUIT_Outer_Wrapper_suit_manifest_cbor
-		      ._SUIT_Manifest_suit_install
-		      ._SUIT_Manifest_suit_install
-		      ._SUIT_Severable_Command_Sequence3_SUIT_Command_Sequence_bstr_cbor
-		      ._SUIT_Command_Sequence__SUIT_Command[0]
-		      ._SUIT_Command_union_choice,
+		      .SUIT_Outer_Wrapper_suit_manifest_cbor
+		      .SUIT_Manifest_suit_install
+		      .SUIT_Manifest_suit_install
+		      .SUIT_Severable_Command_Sequence3_SUIT_Command_Sequence_bstr_cbor
+		      .SUIT_Command_Sequence_SUIT_Command_m[0]
+		      .SUIT_Command_union_choice,
 		      "Expected directive");
-	zassert_equal(_SUIT_Directive_Set_Component_Index,
+	zassert_equal(SUIT_Directive_Set_Component_Index_c,
 		      outerwrapper4
-		      ._SUIT_Outer_Wrapper_suit_manifest_cbor
-		      ._SUIT_Manifest_suit_install
-		      ._SUIT_Manifest_suit_install
-		      ._SUIT_Severable_Command_Sequence3_SUIT_Command_Sequence_bstr_cbor
-		      ._SUIT_Command_Sequence__SUIT_Command[0]
-		      ._SUIT_Command_union__SUIT_Directive
-		      ._SUIT_Directive_choice,
+		      .SUIT_Outer_Wrapper_suit_manifest_cbor
+		      .SUIT_Manifest_suit_install
+		      .SUIT_Manifest_suit_install
+		      .SUIT_Severable_Command_Sequence3_SUIT_Command_Sequence_bstr_cbor
+		      .SUIT_Command_Sequence_SUIT_Command_m[0]
+		      .SUIT_Command_union_SUIT_Directive_m
+		      .SUIT_Directive_choice,
 		      "Expected Component_Index");
-	zassert_equal(_SUIT_Directive_Set_Component_Index_uint,
+	zassert_equal(SUIT_Directive_Set_Component_Index_uint_c,
 		      outerwrapper4
-		      ._SUIT_Outer_Wrapper_suit_manifest_cbor
-		      ._SUIT_Manifest_suit_install
-		      ._SUIT_Manifest_suit_install
-		      ._SUIT_Severable_Command_Sequence3_SUIT_Command_Sequence_bstr_cbor
-		      ._SUIT_Command_Sequence__SUIT_Command[0]
-		      ._SUIT_Command_union__SUIT_Directive
-		      ._SUIT_Directive_Set_Component_Index_choice,
+		      .SUIT_Outer_Wrapper_suit_manifest_cbor
+		      .SUIT_Manifest_suit_install
+		      .SUIT_Manifest_suit_install
+		      .SUIT_Severable_Command_Sequence3_SUIT_Command_Sequence_bstr_cbor
+		      .SUIT_Command_Sequence_SUIT_Command_m[0]
+		      .SUIT_Command_union_SUIT_Directive_m
+		      .SUIT_Directive_Set_Component_Index_choice,
 		      NULL);
-	zassert_equal(_SUIT_Command_union__SUIT_Directive,
+	zassert_equal(SUIT_Command_union_SUIT_Directive_m_c,
 		      outerwrapper4
-		      ._SUIT_Outer_Wrapper_suit_manifest_cbor
-		      ._SUIT_Manifest_suit_install
-		      ._SUIT_Manifest_suit_install
-		      ._SUIT_Severable_Command_Sequence3_SUIT_Command_Sequence_bstr_cbor
-		      ._SUIT_Command_Sequence__SUIT_Command[1]
-		      ._SUIT_Command_union_choice,
+		      .SUIT_Outer_Wrapper_suit_manifest_cbor
+		      .SUIT_Manifest_suit_install
+		      .SUIT_Manifest_suit_install
+		      .SUIT_Severable_Command_Sequence3_SUIT_Command_Sequence_bstr_cbor
+		      .SUIT_Command_Sequence_SUIT_Command_m[1]
+		      .SUIT_Command_union_choice,
 		      "Expected directive");
-	zassert_equal(_SUIT_Directive_Set_Parameters,
+	zassert_equal(SUIT_Directive_Set_Parameters_c,
 		      outerwrapper4
-		      ._SUIT_Outer_Wrapper_suit_manifest_cbor
-		      ._SUIT_Manifest_suit_install
-		      ._SUIT_Manifest_suit_install
-		      ._SUIT_Severable_Command_Sequence3_SUIT_Command_Sequence_bstr_cbor
-		      ._SUIT_Command_Sequence__SUIT_Command[1]
-		      ._SUIT_Command_union__SUIT_Directive
-		      ._SUIT_Directive_choice,
+		      .SUIT_Outer_Wrapper_suit_manifest_cbor
+		      .SUIT_Manifest_suit_install
+		      .SUIT_Manifest_suit_install
+		      .SUIT_Severable_Command_Sequence3_SUIT_Command_Sequence_bstr_cbor
+		      .SUIT_Command_Sequence_SUIT_Command_m[1]
+		      .SUIT_Command_union_SUIT_Directive_m
+		      .SUIT_Directive_choice,
 		      "Expected Set_Parameters");
 	zassert_equal(1,
 		      outerwrapper4
-		      ._SUIT_Outer_Wrapper_suit_manifest_cbor
-		      ._SUIT_Manifest_suit_install
-		      ._SUIT_Manifest_suit_install
-		      ._SUIT_Severable_Command_Sequence3_SUIT_Command_Sequence_bstr_cbor
-		      ._SUIT_Command_Sequence__SUIT_Command[1]
-		      ._SUIT_Command_union__SUIT_Directive
-		      ._SUIT_Directive_Set_Parameters__SUIT_Parameters_count,
+		      .SUIT_Outer_Wrapper_suit_manifest_cbor
+		      .SUIT_Manifest_suit_install
+		      .SUIT_Manifest_suit_install
+		      .SUIT_Severable_Command_Sequence3_SUIT_Command_Sequence_bstr_cbor
+		      .SUIT_Command_Sequence_SUIT_Command_m[1]
+		      .SUIT_Command_union_SUIT_Directive_m
+		      .SUIT_Directive_Set_Parameters_SUIT_Parameters_m_count,
 		      "Expected 1 parameter");
-zassert_equal(_SUIT_Parameters_SUIT_Parameter_URI_List,
+zassert_equal(SUIT_Parameters_SUIT_Parameter_URI_List_c,
 		      outerwrapper4
-		      ._SUIT_Outer_Wrapper_suit_manifest_cbor
-		      ._SUIT_Manifest_suit_install
-		      ._SUIT_Manifest_suit_install
-		      ._SUIT_Severable_Command_Sequence3_SUIT_Command_Sequence_bstr_cbor
-		      ._SUIT_Command_Sequence__SUIT_Command[1]
-		      ._SUIT_Command_union__SUIT_Directive
-		      ._SUIT_Directive_Set_Parameters__SUIT_Parameters[0]
-		      ._SUIT_Directive_Set_Parameters__SUIT_Parameters
-		      ._SUIT_Parameters_choice,
+		      .SUIT_Outer_Wrapper_suit_manifest_cbor
+		      .SUIT_Manifest_suit_install
+		      .SUIT_Manifest_suit_install
+		      .SUIT_Severable_Command_Sequence3_SUIT_Command_Sequence_bstr_cbor
+		      .SUIT_Command_Sequence_SUIT_Command_m[1]
+		      .SUIT_Command_union_SUIT_Directive_m
+		      .SUIT_Directive_Set_Parameters_SUIT_Parameters_m[0]
+		      .SUIT_Directive_Set_Parameters_SUIT_Parameters_m
+		      .SUIT_Parameters_choice,
 		      "Expected uri list parameter");
 	zassert_equal(1,
 		      outerwrapper4
-		      ._SUIT_Outer_Wrapper_suit_manifest_cbor
-		      ._SUIT_Manifest_suit_install
-		      ._SUIT_Manifest_suit_install
-		      ._SUIT_Severable_Command_Sequence3_SUIT_Command_Sequence_bstr_cbor
-		      ._SUIT_Command_Sequence__SUIT_Command[1]
-		      ._SUIT_Command_union__SUIT_Directive
-		      ._SUIT_Directive_Set_Parameters__SUIT_Parameters[0]
-		      ._SUIT_Directive_Set_Parameters__SUIT_Parameters
-		      ._SUIT_Parameters_SUIT_Parameter_URI_List_cbor
-		      ._SUIT_URI_List__SUIT_Prioritized_URI_count,
+		      .SUIT_Outer_Wrapper_suit_manifest_cbor
+		      .SUIT_Manifest_suit_install
+		      .SUIT_Manifest_suit_install
+		      .SUIT_Severable_Command_Sequence3_SUIT_Command_Sequence_bstr_cbor
+		      .SUIT_Command_Sequence_SUIT_Command_m[1]
+		      .SUIT_Command_union_SUIT_Directive_m
+		      .SUIT_Directive_Set_Parameters_SUIT_Parameters_m[0]
+		      .SUIT_Directive_Set_Parameters_SUIT_Parameters_m
+		      .SUIT_Parameters_SUIT_Parameter_URI_List_cbor
+		      .SUIT_URI_List_SUIT_Prioritized_URI_m_count,
 		      "Expected 1 uri");
 	zassert_equal(0,
 		      outerwrapper4
-		      ._SUIT_Outer_Wrapper_suit_manifest_cbor
-		      ._SUIT_Manifest_suit_install
-		      ._SUIT_Manifest_suit_install
-		      ._SUIT_Severable_Command_Sequence3_SUIT_Command_Sequence_bstr_cbor
-		      ._SUIT_Command_Sequence__SUIT_Command[1]
-		      ._SUIT_Command_union__SUIT_Directive
-		      ._SUIT_Directive_Set_Parameters__SUIT_Parameters[0]
-		      ._SUIT_Directive_Set_Parameters__SUIT_Parameters
-		      ._SUIT_Parameters_SUIT_Parameter_URI_List_cbor
-		      ._SUIT_URI_List__SUIT_Prioritized_URI[0]
-		      ._SUIT_Prioritized_URI_priority,
+		      .SUIT_Outer_Wrapper_suit_manifest_cbor
+		      .SUIT_Manifest_suit_install
+		      .SUIT_Manifest_suit_install
+		      .SUIT_Severable_Command_Sequence3_SUIT_Command_Sequence_bstr_cbor
+		      .SUIT_Command_Sequence_SUIT_Command_m[1]
+		      .SUIT_Command_union_SUIT_Directive_m
+		      .SUIT_Directive_Set_Parameters_SUIT_Parameters_m[0]
+		      .SUIT_Directive_Set_Parameters_SUIT_Parameters_m
+		      .SUIT_Parameters_SUIT_Parameter_URI_List_cbor
+		      .SUIT_URI_List_SUIT_Prioritized_URI_m[0]
+		      .SUIT_Prioritized_URI_priority,
 		      "Expected priority x");
 	zassert_mem_equal(expected_uri,
 		      outerwrapper4
-		      ._SUIT_Outer_Wrapper_suit_manifest_cbor
-		      ._SUIT_Manifest_suit_install
-		      ._SUIT_Manifest_suit_install
-		      ._SUIT_Severable_Command_Sequence3_SUIT_Command_Sequence_bstr_cbor
-		      ._SUIT_Command_Sequence__SUIT_Command[1]
-		      ._SUIT_Command_union__SUIT_Directive
-		      ._SUIT_Directive_Set_Parameters__SUIT_Parameters[0]
-		      ._SUIT_Directive_Set_Parameters__SUIT_Parameters
-		      ._SUIT_Parameters_SUIT_Parameter_URI_List_cbor
-		      ._SUIT_URI_List__SUIT_Prioritized_URI[0]
-		      ._SUIT_Prioritized_URI_uri.value,
+		      .SUIT_Outer_Wrapper_suit_manifest_cbor
+		      .SUIT_Manifest_suit_install
+		      .SUIT_Manifest_suit_install
+		      .SUIT_Severable_Command_Sequence3_SUIT_Command_Sequence_bstr_cbor
+		      .SUIT_Command_Sequence_SUIT_Command_m[1]
+		      .SUIT_Command_union_SUIT_Directive_m
+		      .SUIT_Directive_Set_Parameters_SUIT_Parameters_m[0]
+		      .SUIT_Directive_Set_Parameters_SUIT_Parameters_m
+		      .SUIT_Parameters_SUIT_Parameter_URI_List_cbor
+		      .SUIT_URI_List_SUIT_Prioritized_URI_m[0]
+		      .SUIT_Prioritized_URI_uri.value,
 		      sizeof(expected_uri) - 1,
 		      "Expected example.com uri");
-	zassert_equal(_SUIT_Command_union__SUIT_Directive,
+	zassert_equal(SUIT_Command_union_SUIT_Directive_m_c,
 		      outerwrapper4
-		      ._SUIT_Outer_Wrapper_suit_manifest_cbor
-		      ._SUIT_Manifest_suit_install
-		      ._SUIT_Manifest_suit_install
-		      ._SUIT_Severable_Command_Sequence3_SUIT_Command_Sequence_bstr_cbor
-		      ._SUIT_Command_Sequence__SUIT_Command[2]
-		      ._SUIT_Command_union_choice,
+		      .SUIT_Outer_Wrapper_suit_manifest_cbor
+		      .SUIT_Manifest_suit_install
+		      .SUIT_Manifest_suit_install
+		      .SUIT_Severable_Command_Sequence3_SUIT_Command_Sequence_bstr_cbor
+		      .SUIT_Command_Sequence_SUIT_Command_m[2]
+		      .SUIT_Command_union_choice,
 		      "Expected directive");
-	zassert_equal(_SUIT_Directive_Fetch,
+	zassert_equal(SUIT_Directive_Fetch_c,
 		      outerwrapper4
-		      ._SUIT_Outer_Wrapper_suit_manifest_cbor
-		      ._SUIT_Manifest_suit_install
-		      ._SUIT_Manifest_suit_install
-		      ._SUIT_Severable_Command_Sequence3_SUIT_Command_Sequence_bstr_cbor
-		      ._SUIT_Command_Sequence__SUIT_Command[2]
-		      ._SUIT_Command_union__SUIT_Directive
-		      ._SUIT_Directive_choice,
+		      .SUIT_Outer_Wrapper_suit_manifest_cbor
+		      .SUIT_Manifest_suit_install
+		      .SUIT_Manifest_suit_install
+		      .SUIT_Severable_Command_Sequence3_SUIT_Command_Sequence_bstr_cbor
+		      .SUIT_Command_Sequence_SUIT_Command_m[2]
+		      .SUIT_Command_union_SUIT_Directive_m
+		      .SUIT_Directive_choice,
 		      "Expected Directive_Fetch");
 }
 

package/external/libedhoc/externals/zcbor/tests/decode/test2_suit/src/main.c

@@ -6,7 +6,7 @@
 
 #include <zephyr/ztest.h>
 #include "manifest2_decode.h"
-#include "zcbor_debug.h" // Enables use of print functions when debugging tests.
+#include "zcbor_print.h"
 
 
 /* draft-ietf-suit-manifest-02 Example 0 */
@@ -45,144 +45,144 @@ ZTEST(cbor_decode_test2, test_5)
 	uint8_t expected_component1[] = {0x00, 0x34, 0x01};
 	int res;
 
-	zcbor_print("test_vector at: 0x%zu\r\n", (size_t)test_vector1);
-	zcbor_print("test_vector end at: 0x%zu\r\n",
+	zcbor_log("test_vector at: 0x%zu\r\n", (size_t)test_vector1);
+	zcbor_log("test_vector end at: 0x%zu\r\n",
 				((size_t)test_vector1) + sizeof(test_vector1));
 	memset(&outerwrapper1, 0, sizeof(outerwrapper1));
 	res = cbor_decode_SUIT_Outer_Wrapper(test_vector1, sizeof(test_vector1),
 						&outerwrapper1, &decode_len);
 	zassert_equal(ZCBOR_SUCCESS, res, "top-level decoding failed.");
 	zassert_equal(sizeof(test_vector1), decode_len, NULL);
-	zassert_equal(_SUIT_Manifest_Wrapped_suit_manifest, outerwrapper1
-			._SUIT_Outer_Wrapper__SUIT_Manifest_Wrapped
-			._SUIT_Manifest_Wrapped_choice,
+	zassert_equal(SUIT_Manifest_Wrapped_suit_manifest_c, outerwrapper1
+			.SUIT_Outer_Wrapper_SUIT_Manifest_Wrapped_m
+			.SUIT_Manifest_Wrapped_choice,
 			"wrong manifest variant");
 	manifest = &outerwrapper1
-			._SUIT_Outer_Wrapper__SUIT_Manifest_Wrapped
-			._SUIT_Manifest_Wrapped_suit_manifest_cbor;
+			.SUIT_Outer_Wrapper_SUIT_Manifest_Wrapped_m
+			.SUIT_Manifest_Wrapped_suit_manifest_cbor;
 	zassert_equal(1, manifest
-			->_SUIT_Manifest_suit_manifest_sequence_number,
+			->SUIT_Manifest_suit_manifest_sequence_number,
 			"wrong sequence number");
 	zassert_equal(1, manifest
-			->_SUIT_Manifest_suit_common_present,
+			->SUIT_Manifest_suit_common_present,
 			"common should be present");
 	zassert_equal(0, manifest
-			->_SUIT_Manifest_suit_dependency_resolution_present,
+			->SUIT_Manifest_suit_dependency_resolution_present,
 			"should not be present");
 	zassert_equal(0, manifest
-			->_SUIT_Manifest_suit_payload_fetch_present,
+			->SUIT_Manifest_suit_payload_fetch_present,
 			"should not be present");
 	zassert_equal(0, manifest
-			->_SUIT_Manifest_suit_install_present,
+			->SUIT_Manifest_suit_install_present,
 			"should not be present");
 	zassert_equal(0, manifest
-			->_SUIT_Manifest_suit_validate_present,
+			->SUIT_Manifest_suit_validate_present,
 			"should not be present");
 	zassert_equal(0, manifest
-			->_SUIT_Manifest_suit_load_present,
+			->SUIT_Manifest_suit_load_present,
 			"should not be present");
 	zassert_equal(1, manifest
-			->_SUIT_Manifest_suit_run_present,
+			->SUIT_Manifest_suit_run_present,
 			"should not be present");
 	zassert_equal(0, manifest
-			->_SUIT_Manifest_suit_text_present,
+			->SUIT_Manifest_suit_text_present,
 			"should not be present");
 	zassert_equal(0, manifest
-			->_SUIT_Manifest_suit_coswid_present,
+			->SUIT_Manifest_suit_coswid_present,
 			"should not be present");
 	zassert_equal(1, manifest
-			->_SUIT_Manifest_suit_common
-			._SUIT_Manifest_suit_common_cbor
-			._SUIT_Common_suit_components
-			._SUIT_Common_suit_components_cbor
-			._SUIT_Components__SUIT_Component_Identifier_count,
+			->SUIT_Manifest_suit_common
+			.SUIT_Manifest_suit_common_cbor
+			.SUIT_Common_suit_components
+			.SUIT_Common_suit_components_cbor
+			.SUIT_Components_SUIT_Component_Identifier_m_count,
 			"Wrong number of common components");
 	component = &manifest
-			->_SUIT_Manifest_suit_common
-			._SUIT_Manifest_suit_common_cbor
-			._SUIT_Common_suit_components
-			._SUIT_Common_suit_components_cbor
-			._SUIT_Components__SUIT_Component_Identifier[0];
+			->SUIT_Manifest_suit_common
+			.SUIT_Manifest_suit_common_cbor
+			.SUIT_Common_suit_components
+			.SUIT_Common_suit_components_cbor
+			.SUIT_Components_SUIT_Component_Identifier_m[0];
 	zassert_equal(2, component
-			->_SUIT_Component_Identifier_bstr_count,
+			->SUIT_Component_Identifier_bstr_count,
 			"Wrong number of elements in component");
 	zassert_equal(sizeof(expected_component0), component
-			->_SUIT_Component_Identifier_bstr[0]
+			->SUIT_Component_Identifier_bstr[0]
 			.len,
 			"component elem 0 len doesn't match.");
 	zassert_mem_equal(expected_component0, component
-			->_SUIT_Component_Identifier_bstr[0]
+			->SUIT_Component_Identifier_bstr[0]
 			.value,
 			sizeof(expected_component0),
 			"component elem 0 doesn't match.");
 	zassert_equal(sizeof(expected_component1), component
-			->_SUIT_Component_Identifier_bstr[1]
+			->SUIT_Component_Identifier_bstr[1]
 			.len,
 			"component elem 1 len doesn't match.");
 	zassert_mem_equal(expected_component1, component
-			->_SUIT_Component_Identifier_bstr[1]
+			->SUIT_Component_Identifier_bstr[1]
 			.value,
 			sizeof(expected_component1),
 			"component elem 1 doesn't match.");
 
-	zcbor_print("\r\n");
+	zcbor_log("\r\n");
 	zassert_equal(1, manifest
-			->_SUIT_Manifest_suit_common
-			._SUIT_Manifest_suit_common_cbor
-			._SUIT_Common_suit_common_sequence_present,
+			->SUIT_Manifest_suit_common
+			.SUIT_Manifest_suit_common_cbor
+			.SUIT_Common_suit_common_sequence_present,
 			"common sequence should be present.");
 	memset(&sequence, 0, sizeof(sequence));
 	res = cbor_decode_SUIT_Command_Sequence(
 			manifest
-			->_SUIT_Manifest_suit_common
-			._SUIT_Manifest_suit_common_cbor
-			._SUIT_Common_suit_common_sequence
-			._SUIT_Common_suit_common_sequence
+			->SUIT_Manifest_suit_common
+			.SUIT_Manifest_suit_common_cbor
+			.SUIT_Common_suit_common_sequence
+			.SUIT_Common_suit_common_sequence
 			.value,
 			manifest
-			->_SUIT_Manifest_suit_common
-			._SUIT_Manifest_suit_common_cbor
-			._SUIT_Common_suit_common_sequence
-			._SUIT_Common_suit_common_sequence
+			->SUIT_Manifest_suit_common
+			.SUIT_Manifest_suit_common_cbor
+			.SUIT_Common_suit_common_sequence
+			.SUIT_Common_suit_common_sequence
 			.len,
 			&sequence, &decode_len);
 	zassert_equal(ZCBOR_SUCCESS, res, "Parsing common sequence failed.");
 	zassert_equal(manifest
-			->_SUIT_Manifest_suit_common
-			._SUIT_Manifest_suit_common_cbor
-			._SUIT_Common_suit_common_sequence
-			._SUIT_Common_suit_common_sequence
+			->SUIT_Manifest_suit_common
+			.SUIT_Manifest_suit_common_cbor
+			.SUIT_Common_suit_common_sequence
+			.SUIT_Common_suit_common_sequence
 			.len, decode_len, NULL);
 	zassert_equal(1, sequence
-			._SUIT_Command_Sequence__SUIT_Command_count,
+			.SUIT_Command_Sequence_SUIT_Command_m_count,
 			"Should be one command (was %d).", sequence
-			._SUIT_Command_Sequence__SUIT_Command_count);
-	zassert_equal(_SUIT_Command__SUIT_Directive, sequence
-			._SUIT_Command_Sequence__SUIT_Command[0]
-			._SUIT_Command_choice,
+			.SUIT_Command_Sequence_SUIT_Command_m_count);
+	zassert_equal(SUIT_Command_SUIT_Directive_m_c, sequence
+			.SUIT_Command_Sequence_SUIT_Command_m[0]
+			.SUIT_Command_choice,
 			"Should be a directive.");
 	zassert_equal(2, sequence
-			._SUIT_Command_Sequence__SUIT_Command[0]
-			._SUIT_Command__SUIT_Directive
-			.___suit_directive_set_parameters_map__SUIT_Parameters_count,
+			.SUIT_Command_Sequence_SUIT_Command_m[0]
+			.SUIT_Command_SUIT_Directive_m
+			.suit_directive_set_parameters_m_l_map_SUIT_Parameters_m_count,
 			"Should be two vars (parameters).");
-	zcbor_print("\r\n");
+	zcbor_log("\r\n");
 
 	memset(&sequence, 0, sizeof(sequence));
 	res = cbor_decode_SUIT_Command_Sequence(
 			manifest
-			->_SUIT_Manifest_suit_run
-			._SUIT_Manifest_suit_run
+			->SUIT_Manifest_suit_run
+			.SUIT_Manifest_suit_run
 			.value,
 			manifest
-			->_SUIT_Manifest_suit_run
-			._SUIT_Manifest_suit_run
+			->SUIT_Manifest_suit_run
+			.SUIT_Manifest_suit_run
 			.len,
 			&sequence, &decode_len);
 	zassert_equal(ZCBOR_SUCCESS, res, "Parsing run command sequence failed.");
 	zassert_equal(manifest
-			->_SUIT_Manifest_suit_run
-			._SUIT_Manifest_suit_run
+			->SUIT_Manifest_suit_run
+			.SUIT_Manifest_suit_run
 			.len, decode_len, NULL);
 }