edhoc 1.0.5 → 1.1.0

package/external/libedhoc/externals/zcbor/tests/encode/test1_suit/src/main.c

@@ -7,7 +7,7 @@
 #include <zephyr/ztest.h>
 #include "manifest3_decode.h"
 #include "manifest3_encode.h"
-#include "zcbor_debug.h" // Enables use of print functions when debugging tests.
+#include "zcbor_print.h"
 
 /* draft-ietf-suit-manifest-02 Example 0 */
 uint8_t test_vector0_02[] = {
@@ -244,7 +244,7 @@ void test_command_sequence(struct zcbor_string *sequence_str,
 		return;
 	}
 
-	zcbor_print("\r\ntest %s\r\n", name);
+	zcbor_log("\r\ntest %s\r\n", name);
 
 	memset(&sequence1, 0, sizeof(sequence1));
 	int res = cbor_decode_SUIT_Command_Sequence(sequence_str->value,
@@ -263,48 +263,48 @@ void test_command_sequence(struct zcbor_string *sequence_str,
 		sequence_str->len,
 		NULL);
 
-	for (uint32_t i = 0; i < sequence1._SUIT_Command_Sequence_union_count; i++) {
-		struct SUIT_Directive_ *directive;
+	for (uint32_t i = 0; i < sequence1.SUIT_Command_Sequence_union_count; i++) {
+		struct SUIT_Directive_r *directive;
 		bool directive_present;
 		directive = &sequence1
-			._SUIT_Command_Sequence_union[i]
-			._SUIT_Command_Sequence_union__SUIT_Directive;
+			.SUIT_Command_Sequence_union[i]
+			.SUIT_Command_Sequence_union_SUIT_Directive_m;
 		directive_present = sequence1
-			._SUIT_Command_Sequence_union[i]
-			._SUIT_Command_Sequence_union_choice
-			== _SUIT_Command_Sequence_union__SUIT_Directive;
+			.SUIT_Command_Sequence_union[i]
+			.SUIT_Command_Sequence_union_choice
+			== SUIT_Command_Sequence_union_SUIT_Directive_m_c;
 
 		run_seq = &directive
-			->_SUIT_Directive___suit_directive_run_sequence_SUIT_Command_Sequence_bstr;
+			->SUIT_Directive_suit_directive_run_sequence_m_l_SUIT_Command_Sequence_bstr;
 		run_seq_present = directive_present
 			&& directive
-			->_SUIT_Directive_choice
-			== _SUIT_Directive___suit_directive_run_sequence;
+			->SUIT_Directive_choice
+			== SUIT_Directive_suit_directive_run_sequence_m_l_c;
 		test_command_sequence(run_seq, run_seq_present, "run_seq");
 
 		for (uint32_t j = 0; j < directive
-			->_SUIT_Directive___suit_directive_try_each__SUIT_Directive_Try_Each_Argument
-			._SUIT_Directive_Try_Each_Argument_SUIT_Command_Sequence_bstr_count; j++) {
+			->SUIT_Directive_suit_directive_try_each_m_l_SUIT_Directive_Try_Each_Argument_m
+			.SUIT_Directive_Try_Each_Argument_SUIT_Command_Sequence_bstr_count; j++) {
 
 			try_each1 = &directive
-				->_SUIT_Directive___suit_directive_try_each__SUIT_Directive_Try_Each_Argument
-				._SUIT_Directive_Try_Each_Argument_SUIT_Command_Sequence_bstr[j];
+				->SUIT_Directive_suit_directive_try_each_m_l_SUIT_Directive_Try_Each_Argument_m
+				.SUIT_Directive_Try_Each_Argument_SUIT_Command_Sequence_bstr[j];
 			try_each1_present = directive_present
-				&& directive->_SUIT_Directive_choice
-				== _SUIT_Directive___suit_directive_try_each;
+				&& directive->SUIT_Directive_choice
+				== SUIT_Directive_suit_directive_try_each_m_l_c;
 			test_command_sequence(try_each1, try_each1_present, "try_each1");
 		}
 
 		try_each2 = &directive
-			->_SUIT_Directive___suit_directive_try_each__SUIT_Directive_Try_Each_Argument
-			._SUIT_Directive_Try_Each_Argument_union_SUIT_Command_Sequence_bstr;
+			->SUIT_Directive_suit_directive_try_each_m_l_SUIT_Directive_Try_Each_Argument_m
+			.SUIT_Directive_Try_Each_Argument_union_SUIT_Command_Sequence_bstr;
 		try_each2_present = directive_present
-			&& directive->_SUIT_Directive_choice
-			== _SUIT_Directive___suit_directive_try_each
+			&& directive->SUIT_Directive_choice
+			== SUIT_Directive_suit_directive_try_each_m_l_c
 			&& directive
-			->_SUIT_Directive___suit_directive_try_each__SUIT_Directive_Try_Each_Argument
-			._SUIT_Directive_Try_Each_Argument_union_choice
-			== _SUIT_Directive_Try_Each_Argument_union_SUIT_Command_Sequence_bstr;
+			->SUIT_Directive_suit_directive_try_each_m_l_SUIT_Directive_Try_Each_Argument_m
+			.SUIT_Directive_Try_Each_Argument_union_choice
+			== SUIT_Directive_Try_Each_Argument_union_SUIT_Command_Sequence_bstr_c;
 		test_command_sequence(try_each2, try_each2_present, "try_each2");
 
 	}
@@ -338,102 +338,102 @@ void test_manifest(const uint8_t *input, uint32_t len)
 	int res;
 	size_t out_len;
 
-	zcbor_print("test_vector at: 0x%zx\r\n", (size_t)input);
-	zcbor_print("test_vector end at: 0x%zx\r\n",
+	zcbor_log("test_vector at: 0x%zx\r\n", (size_t)input);
+	zcbor_log("test_vector end at: 0x%zx\r\n",
 				((size_t)input) + len);
 	res = cbor_decode_SUIT_Outer_Wrapper(input, len, &outerwrapper1, NULL);
 	zassert_equal(ZCBOR_SUCCESS, res, "top-level decoding failed.");
 
 	dependency1 = &outerwrapper1
-		._SUIT_Outer_Wrapper_suit_dependency_resolution
-		._SUIT_Outer_Wrapper_suit_dependency_resolution;
+		.SUIT_Outer_Wrapper_suit_dependency_resolution
+		.SUIT_Outer_Wrapper_suit_dependency_resolution;
 	dependency1_present = outerwrapper1
-		._SUIT_Outer_Wrapper_suit_dependency_resolution_present;
+		.SUIT_Outer_Wrapper_suit_dependency_resolution_present;
 	test_command_sequence(dependency1, dependency1_present, "dependency1");
 
 	fetch1 = &outerwrapper1
-		._SUIT_Outer_Wrapper_suit_payload_fetch
-		._SUIT_Outer_Wrapper_suit_payload_fetch;
+		.SUIT_Outer_Wrapper_suit_payload_fetch
+		.SUIT_Outer_Wrapper_suit_payload_fetch;
 	fetch1_present = outerwrapper1
-		._SUIT_Outer_Wrapper_suit_payload_fetch_present;
+		.SUIT_Outer_Wrapper_suit_payload_fetch_present;
 	test_command_sequence(fetch1, fetch1_present, "fetch1");
 
 	install1 = &outerwrapper1
-		._SUIT_Outer_Wrapper_suit_install
-		._SUIT_Outer_Wrapper_suit_install;
+		.SUIT_Outer_Wrapper_suit_install
+		.SUIT_Outer_Wrapper_suit_install;
 	install1_present = outerwrapper1
-		._SUIT_Outer_Wrapper_suit_install_present;
+		.SUIT_Outer_Wrapper_suit_install_present;
 	test_command_sequence(install1, install1_present, "install1");
 
 	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;
 
 	common_seq = &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;
 	common_seq_present = manifest
-		->_SUIT_Manifest_suit_common_present
+		->SUIT_Manifest_suit_common_present
 		&& 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;
 	test_command_sequence(common_seq, common_seq_present, "common_seq");
 
 	dependency2 = &manifest
-		->_SUIT_Manifest_suit_dependency_resolution
-		._SUIT_Manifest_suit_dependency_resolution_SUIT_Command_Sequence_bstr;
+		->SUIT_Manifest_suit_dependency_resolution
+		.SUIT_Manifest_suit_dependency_resolution_SUIT_Command_Sequence_bstr;
 	dependency2_present = manifest
-		->_SUIT_Manifest_suit_dependency_resolution_present
+		->SUIT_Manifest_suit_dependency_resolution_present
 		&& manifest
-		->_SUIT_Manifest_suit_dependency_resolution
-		._SUIT_Manifest_suit_dependency_resolution_choice ==
-		_SUIT_Manifest_suit_dependency_resolution_SUIT_Command_Sequence_bstr;
+		->SUIT_Manifest_suit_dependency_resolution
+		.SUIT_Manifest_suit_dependency_resolution_choice ==
+		SUIT_Manifest_suit_dependency_resolution_SUIT_Command_Sequence_bstr_c;
 	test_command_sequence(dependency2, dependency2_present, "dependency2");
 
 	fetch2 = &manifest
-		->_SUIT_Manifest_suit_payload_fetch
-		._SUIT_Manifest_suit_payload_fetch_SUIT_Command_Sequence_bstr;
+		->SUIT_Manifest_suit_payload_fetch
+		.SUIT_Manifest_suit_payload_fetch_SUIT_Command_Sequence_bstr;
 	fetch2_present = manifest
-		->_SUIT_Manifest_suit_payload_fetch_present
+		->SUIT_Manifest_suit_payload_fetch_present
 		&& manifest
-		->_SUIT_Manifest_suit_payload_fetch
-		._SUIT_Manifest_suit_payload_fetch_choice ==
-		_SUIT_Manifest_suit_payload_fetch_SUIT_Command_Sequence_bstr;
+		->SUIT_Manifest_suit_payload_fetch
+		.SUIT_Manifest_suit_payload_fetch_choice ==
+		SUIT_Manifest_suit_payload_fetch_SUIT_Command_Sequence_bstr_c;
 	test_command_sequence(fetch2, fetch2_present, "fetch2");
 
 	install2 = &manifest
-		->_SUIT_Manifest_suit_install
-		._SUIT_Manifest_suit_install_SUIT_Command_Sequence_bstr;
+		->SUIT_Manifest_suit_install
+		.SUIT_Manifest_suit_install_SUIT_Command_Sequence_bstr;
 	install2_present = manifest
-		->_SUIT_Manifest_suit_install_present
+		->SUIT_Manifest_suit_install_present
 		&& manifest
-		->_SUIT_Manifest_suit_install
-		._SUIT_Manifest_suit_install_choice ==
-		_SUIT_Manifest_suit_install_SUIT_Command_Sequence_bstr;
+		->SUIT_Manifest_suit_install
+		.SUIT_Manifest_suit_install_choice ==
+		SUIT_Manifest_suit_install_SUIT_Command_Sequence_bstr_c;
 	test_command_sequence(install2, install2_present, "install2");
 
 	validate = &manifest
-		->_SUIT_Manifest_suit_validate
-		._SUIT_Manifest_suit_validate;
+		->SUIT_Manifest_suit_validate
+		.SUIT_Manifest_suit_validate;
 	validate_present = manifest
-		->_SUIT_Manifest_suit_validate_present;
+		->SUIT_Manifest_suit_validate_present;
 	test_command_sequence(validate, validate_present, "validate");
 
 	load = &manifest
-		->_SUIT_Manifest_suit_load
-		._SUIT_Manifest_suit_load;
+		->SUIT_Manifest_suit_load
+		.SUIT_Manifest_suit_load;
 	load_present = manifest
-		->_SUIT_Manifest_suit_load_present;
+		->SUIT_Manifest_suit_load_present;
 	test_command_sequence(load, load_present, "load");
 
 	run = &manifest
-		->_SUIT_Manifest_suit_run
-		._SUIT_Manifest_suit_run;
+		->SUIT_Manifest_suit_run
+		.SUIT_Manifest_suit_run;
 	run_present = manifest
-		->_SUIT_Manifest_suit_run_present;
+		->SUIT_Manifest_suit_run_present;
 	test_command_sequence(run, run_present, "run");
 
 	res = cbor_encode_SUIT_Outer_Wrapper(output,

package/external/libedhoc/externals/zcbor/tests/encode/test2_simple/src/main.c

@@ -7,7 +7,6 @@
 #include <zephyr/ztest.h>
 #include <pet_encode.h>
 #include <zcbor_encode.h>
-#include <zcbor_debug.h> // Enables use of print functions when debugging tests.
 
 
 #define CONCAT_BYTE(a,b) a ## b
@@ -41,7 +40,7 @@ ZTEST(cbor_encode_test2, test_pet)
 		.names = {{.value = "foo", .len = 3}, {.value = "bar", .len = 3}},
 		.names_count = 2,
 		.birthday = {.value = (uint8_t[]){1,2,3,4,5,6,7,8}, .len = 8},
-		.species_choice = _Pet_species_dog
+		.species_choice = Pet_species_dog_c
 	};
 	uint8_t exp_output[] = {
 		LIST(3),

package/external/libedhoc/externals/zcbor/tests/encode/test3_corner_cases/src/main.c

@@ -6,7 +6,6 @@
 
 #include <zephyr/ztest.h>
 #include "corner_cases_encode.h"
-#include "zcbor_debug.h" // Enables use of print functions when debugging tests.
 
 #define CONCAT_BYTE(a,b) a ## b
 
@@ -87,8 +86,9 @@ ZTEST(cbor_encode_test3, test_numbers)
 ZTEST(cbor_encode_test3, test_numbers2)
 {
 	const uint8_t exp_payload_numbers2[] = {
-		LIST(7),
+		LIST(8),
 			0x1A, 0x00, 0x12, 0x34, 0x56, // 0x123456
+			0x3A, 0x7F, 0xFF, 0xFF, 0xFF, // -0x8000_0000
 			0x1B, 0x01, 2, 3, 4, 5, 6, 7, 8, // 0x0102030405060708
 			0x1B, 0x11, 2, 3, 4, 5, 6, 7, 9, // 0x1102030405060709
 			0x00, // 0
@@ -99,6 +99,7 @@ ZTEST(cbor_encode_test3, test_numbers2)
 	};
 	struct Numbers2 numbers2 = {
 		.threebytes = 0x123456,
+		.int32 =  -0x80000000L,
 		.big_int = 0x0102030405060708,
 		.big_uint = 0x1102030405060709,
 		.big_uint2 = 0,
@@ -122,9 +123,9 @@ ZTEST(cbor_encode_test3, test_tagged_union)
 
 	uint8_t output[5];
 
-	struct TaggedUnion_ input;
-	input.TaggedUnion_choice = _TaggedUnion_bool;
-	input._bool = true;
+	struct TaggedUnion_r input;
+	input.TaggedUnion_choice = TaggedUnion_bool_c;
+	input.Bool = true;
 
 	zassert_equal(ZCBOR_SUCCESS, cbor_encode_TaggedUnion(output,
 		sizeof(output), &input, &encode_len), "%d\r\n");
@@ -132,7 +133,7 @@ ZTEST(cbor_encode_test3, test_tagged_union)
 	zassert_equal(sizeof(exp_payload_tagged_union1), encode_len, NULL);
 	zassert_mem_equal(exp_payload_tagged_union1, output, sizeof(exp_payload_tagged_union1), NULL);
 
-	input.TaggedUnion_choice = _TaggedUnion_uint;
+	input.TaggedUnion_choice = TaggedUnion_uint_c;
 	input.uint = 0x10;
 
 	zassert_equal(ZCBOR_SUCCESS, cbor_encode_TaggedUnion(output,
@@ -512,43 +513,43 @@ ZTEST(cbor_encode_test3, test_union)
 		0x03, 0x23, 0x03, 0x23, 0x03, 0x23
 	};
 
-	struct Union_ _union1 = {.Union_choice = _Union__Group};
-	struct Union_ _union2 = {.Union_choice = _Union__MultiGroup, ._MultiGroup.MultiGroup_count = 1};
-	struct Union_ _union3 = {.Union_choice = _Union__uint3};
-	struct Union_ _union4 = {.Union_choice = _Union_hello_tstr};
-	struct Union_ _union5 = {.Union_choice = _Union__MultiGroup, ._MultiGroup.MultiGroup_count = 6};
-	struct Union_ _union6_inv = {.Union_choice = _Union__MultiGroup, ._MultiGroup.MultiGroup_count = 7};
+	struct Union_r union1 = {.Union_choice = Union_Group_m_c};
+	struct Union_r union2 = {.Union_choice = Union_MultiGroup_m_c, .MultiGroup_m.MultiGroup_count = 1};
+	struct Union_r union3 = {.Union_choice = Union_uint3_l_c};
+	struct Union_r union4 = {.Union_choice = Union_hello_tstr_c};
+	struct Union_r union5 = {.Union_choice = Union_MultiGroup_m_c, .MultiGroup_m.MultiGroup_count = 6};
+	struct Union_r union6_inv = {.Union_choice = Union_MultiGroup_m_c, .MultiGroup_m.MultiGroup_count = 7};
 
 	uint8_t output[15];
 	size_t out_len;
 
 	zassert_equal(ZCBOR_SUCCESS, cbor_encode_Union(output, sizeof(output),
-				&_union1, &out_len), NULL);
+				&union1, &out_len), NULL);
 	zassert_equal(sizeof(exp_payload_union1), out_len, NULL);
 	zassert_mem_equal(exp_payload_union1, output, sizeof(exp_payload_union1), NULL);
 
 	zassert_equal(ZCBOR_SUCCESS, cbor_encode_Union(output, sizeof(output),
-				&_union2, &out_len), NULL);
+				&union2, &out_len), NULL);
 	zassert_equal(sizeof(exp_payload_union2), out_len, NULL);
 	zassert_mem_equal(exp_payload_union2, output, sizeof(exp_payload_union2), NULL);
 
 	zassert_equal(ZCBOR_SUCCESS, cbor_encode_Union(output, sizeof(output),
-				&_union3, &out_len), NULL);
+				&union3, &out_len), NULL);
 	zassert_equal(sizeof(exp_payload_union3), out_len, NULL);
 	zassert_mem_equal(exp_payload_union3, output, sizeof(exp_payload_union3), NULL);
 
 	zassert_equal(ZCBOR_SUCCESS, cbor_encode_Union(output, sizeof(output),
-				&_union4, &out_len), NULL);
+				&union4, &out_len), NULL);
 	zassert_equal(sizeof(exp_payload_union4), out_len, NULL);
 	zassert_mem_equal(exp_payload_union4, output, sizeof(exp_payload_union4), NULL);
 
 	zassert_equal(ZCBOR_SUCCESS, cbor_encode_Union(output, sizeof(output),
-				&_union5, &out_len), NULL);
+				&union5, &out_len), NULL);
 	zassert_equal(sizeof(exp_payload_union5), out_len, NULL);
 	zassert_mem_equal(exp_payload_union5, output, sizeof(exp_payload_union5), NULL);
 
 	zassert_equal(ZCBOR_ERR_ITERATIONS, cbor_encode_Union(output, sizeof(output),
-				&_union6_inv, &out_len), NULL);
+				&union6_inv, &out_len), NULL);
 }
 
 ZTEST(cbor_encode_test3, test_levels)
@@ -572,8 +573,8 @@ ZTEST(cbor_encode_test3, test_levels)
 	uint8_t output[32];
 	size_t out_len;
 
-	struct Level2 level1 = {._Level3_count = 2, ._Level3 = {
-		{._Level4_count = 4}, {._Level4_count = 4}
+	struct Level2 level1 = {.Level3_m_count = 2, .Level3_m = {
+		{.Level4_m_count = 4}, {.Level4_m_count = 4}
 	}};
 	_Static_assert(sizeof(exp_payload_levels1) <= sizeof(output),
 		"Payload is larger than output");
@@ -613,7 +614,7 @@ ZTEST(cbor_encode_test3, test_map)
 	};
 
 	struct Map map1 = {
-		.union_choice = _union_uint7uint,
+		.union_choice = union_uint7uint_c,
 		.uint7uint = 1,
 		.twotothree_count = 2,
 		.twotothree = {
@@ -623,7 +624,7 @@ ZTEST(cbor_encode_test3, test_map)
 	};
 	struct Map map2 = {
 		.listkey = true,
-		.union_choice = _union_uint7uint,
+		.union_choice = union_uint7uint_c,
 		.uint7uint = 1,
 		.twotothree_count = 3,
 		.twotothree = {
@@ -633,7 +634,7 @@ ZTEST(cbor_encode_test3, test_map)
 		}
 	};
 	struct Map map3 = {
-		.union_choice = _union_nintuint,
+		.union_choice = union_nintuint_c,
 		.nintuint = 1,
 		.twotothree_count = 2,
 		.twotothree = {
@@ -740,31 +741,31 @@ ZTEST(cbor_encode_test3, test_nested_map_list_map)
 	const uint8_t exp_payload_nested_mlm4[] = {MAP(2), LIST(0), END LIST(0), END LIST(0), END LIST(0), END END};
 	const uint8_t exp_payload_nested_mlm5[] = {MAP(3), LIST(0), END LIST(0), END LIST(0), END LIST(0), END LIST(0), END LIST(2), MAP(0), END MAP(0), END END END};
 	struct NestedMapListMap maplistmap1 = {
-		._map_count = 1,
-		._map = {{0}}
+		.map_l_count = 1,
+		.map_l = {{0}}
 	};
 	struct NestedMapListMap maplistmap2 = {
-		._map_count = 1,
-		._map = {
+		.map_l_count = 1,
+		.map_l = {
 			{.map_count = 1}
 		}
 	};
 	struct NestedMapListMap maplistmap3 = {
-		._map_count = 1,
-		._map = {
+		.map_l_count = 1,
+		.map_l = {
 			{.map_count = 2}
 		}
 	};
 	struct NestedMapListMap maplistmap4 = {
-		._map_count = 2,
-		._map = {
+		.map_l_count = 2,
+		.map_l = {
 			{.map_count = 0},
 			{.map_count = 0},
 		}
 	};
 	struct NestedMapListMap maplistmap5 = {
-		._map_count = 3,
-		._map = {
+		.map_l_count = 3,
+		.map_l = {
 			{.map_count = 0},
 			{.map_count = 0},
 			{.map_count = 2},
@@ -1072,12 +1073,12 @@ ZTEST(cbor_encode_test3, test_unabstracted)
 	uint8_t exp_payload_unabstracted0[] = {LIST(2), 0x01, 0x03, END};
 	uint8_t exp_payload_unabstracted1[] = {LIST(2), 0x02, 0x04, END};
 	struct Unabstracted result_unabstracted0 = {
-		.unabstractedunion1_choice = _Unabstracted_unabstractedunion1_choice1,
-		.unabstractedunion2_choice = _Unabstracted_unabstractedunion2_uint3,
+		.unabstractedunion1_choice = Unabstracted_unabstractedunion1_choice1_c,
+		.unabstractedunion2_choice = Unabstracted_unabstractedunion2_uint3_c,
 	};
 	struct Unabstracted result_unabstracted1 = {
-		.unabstractedunion1_choice = _Unabstracted_unabstractedunion1_choice2,
-		.unabstractedunion2_choice = _Unabstracted_unabstractedunion2_choice4,
+		.unabstractedunion1_choice = Unabstracted_unabstractedunion1_choice2_c,
+		.unabstractedunion2_choice = Unabstracted_unabstractedunion2_choice4_c,
 	};
 	uint8_t output[4];
 	size_t out_len;
@@ -1153,14 +1154,14 @@ ZTEST(cbor_encode_test3, test_doublemap)
 		.uintmap = {
 			{
 				.uintmap_key = 1,
-				._MyKeys = {
+				.MyKeys_m = {
 					.uint1int_present = true,
 					.uint1int = {.uint1int = 1},
 				}
 			},
 			{
 				.uintmap_key = 2,
-				._MyKeys = {
+				.MyKeys_m = {
 					.uint2int_present = true,
 					.uint2int = {.uint2int = 2},
 				}
@@ -1351,7 +1352,7 @@ ZTEST(cbor_encode_test3, test_map_length)
 	uint8_t output[60];
 
 	uint8_t mac[] = {1, 2, 3, 4, 5, 6};
-	uint8_t uuid[] = {8, 7, 6, 5, 4, 3, 2, 1, 8, 7, 6, 5, 4, 3, 2, 1, 0};
+	uint8_t uuid_m[] = {8, 7, 6, 5, 4, 3, 2, 1, 8, 7, 6, 5, 4, 3, 2, 1, 0};
 
 	input.result = 1;
 	input.mac_addr.len = 6;
@@ -1364,23 +1365,23 @@ ZTEST(cbor_encode_test3, test_map_length)
 	zassert_mem_equal(exp_map_length_payload1, output, num_encode, NULL);
 
 	input.end_device_array_present = true;
-	input.end_device_array._uuid_count = 0;
+	input.end_device_array.uuid_m_count = 0;
 	zassert_equal(ZCBOR_SUCCESS, cbor_encode_MapLength(output,
 		sizeof(output), &input, &num_encode), NULL);
 	zassert_equal(sizeof(exp_map_length_payload2), num_encode, "%d != %d\r\n", sizeof(exp_map_length_payload2), num_encode);
 	zassert_mem_equal(exp_map_length_payload2, output, num_encode, NULL);
 
-	input.end_device_array._uuid_count = 1;
-	input.end_device_array._uuid[0].len = 16;
-	input.end_device_array._uuid[0].value = uuid;
+	input.end_device_array.uuid_m_count = 1;
+	input.end_device_array.uuid_m[0].len = 16;
+	input.end_device_array.uuid_m[0].value = uuid_m;
 	zassert_equal(ZCBOR_SUCCESS, cbor_encode_MapLength(output,
 		sizeof(output), &input, &num_encode), NULL);
 	zassert_equal(sizeof(exp_map_length_payload3), num_encode, "%d != %d\r\n", sizeof(exp_map_length_payload3), num_encode);
 	zassert_mem_equal(exp_map_length_payload3, output, num_encode, NULL);
 
-	input.end_device_array._uuid_count = 2;
-	input.end_device_array._uuid[1].len = 16;
-	input.end_device_array._uuid[1].value = uuid;
+	input.end_device_array.uuid_m_count = 2;
+	input.end_device_array.uuid_m[1].len = 16;
+	input.end_device_array.uuid_m[1].value = uuid_m;
 	int err = cbor_encode_MapLength(output,
 		sizeof(output), &input, &num_encode);
 	zassert_equal(ZCBOR_SUCCESS, err, "%d\r\b", err);
@@ -1392,7 +1393,7 @@ ZTEST(cbor_encode_test3, test_map_length)
 		sizeof(output), &input, &num_encode), NULL);
 
 	input.mac_addr.len++;
-	input.end_device_array._uuid[1].len++;
+	input.end_device_array.uuid_m[1].len++;
 	err = cbor_encode_MapLength(output,
 		sizeof(output), &input, &num_encode);
 	zassert_equal(ZCBOR_ERR_WRONG_RANGE, err, "%d\r\b", err);
@@ -1421,13 +1422,13 @@ ZTEST(cbor_encode_test3, test_union_int)
 	size_t num_encode;
 	uint8_t output[60];
 
-	input.union_choice = _union__uint5;
+	input.union_choice = union_uint5_l_c;
 	zassert_equal(ZCBOR_SUCCESS, cbor_encode_UnionInt2(output, sizeof(output),
 			&input, &num_encode), NULL);
 	zassert_equal(sizeof(exp_union_int_payload1), num_encode, NULL);
 	zassert_mem_equal(exp_union_int_payload1, output, num_encode, NULL);
 
-	input.union_choice = _union__uint1000;
+	input.union_choice = union_uint1000_l_c;
 	input.bstr.len = 16;
 	input.bstr.value = (uint8_t *)&"This is thousand";
 	zassert_equal(ZCBOR_SUCCESS, cbor_encode_UnionInt2(output, sizeof(output),
@@ -1435,17 +1436,17 @@ ZTEST(cbor_encode_test3, test_union_int)
 	zassert_equal(sizeof(exp_union_int_payload2), num_encode, NULL);
 	zassert_mem_equal(exp_union_int_payload2, output, num_encode, NULL);
 
-	input.union_choice = _union__nint;
-	input._number.number_choice = _number_int;
-	input._number._int = 1;
+	input.union_choice = union_nint_l_c;
+	input.number_m.number_choice = number_int_c;
+	input.number_m.Int = 1;
 	zassert_equal(ZCBOR_SUCCESS, cbor_encode_UnionInt2(output, sizeof(output),
 			&input, &num_encode), NULL);
 	zassert_equal(sizeof(exp_union_int_payload3), num_encode, NULL);
 	zassert_mem_equal(exp_union_int_payload3, output, num_encode, NULL);
 
-	input.union_choice = _UnionInt2_union__Structure_One;
-	input._Structure_One.some_array.value = (uint8_t *)&"hi";
-	input._Structure_One.some_array.len = 2;
+	input.union_choice = UnionInt2_union_Structure_One_m_c;
+	input.Structure_One_m.some_array.value = (uint8_t *)&"hi";
+	input.Structure_One_m.some_array.len = 2;
 	zassert_equal(ZCBOR_SUCCESS, cbor_encode_UnionInt2(output, sizeof(output),
 			&input, &num_encode), NULL);
 	zassert_equal(sizeof(exp_union_int_payload4), num_encode, NULL);
@@ -1524,4 +1525,30 @@ ZTEST(cbor_encode_test3, test_intmax)
 	zassert_mem_equal(exp_intmax2_payload2, output, num_encode, NULL);
 }
 
+
+/* Test that zcbor generates variable names that don't contain unsupported characters. */
+ZTEST(cbor_encode_test3, test_invalid_identifiers)
+{
+	uint8_t exp_invalid_identifiers_payload1[] = {
+		LIST(3),
+		0x64, '1', 'o', 'n', 'e',
+		0x02, /* Ø */
+		0x67, '{', '[', 'a', '-', 'z', ']', '}',
+		END
+	};
+	struct InvalidIdentifiers input;
+	size_t num_encode;
+	uint8_t output[100];
+
+	input._1one_tstr_present = true;
+	input.__present = true;
+	input.a_z_tstr_present = true;
+
+	zassert_equal(ZCBOR_SUCCESS, cbor_encode_InvalidIdentifiers(output,
+		sizeof(output), &input, &num_encode), NULL);
+	zassert_equal(sizeof(exp_invalid_identifiers_payload1), num_encode, NULL);
+	zassert_mem_equal(exp_invalid_identifiers_payload1, output, num_encode, NULL);
+}
+
+
 ZTEST_SUITE(cbor_encode_test3, NULL, NULL, NULL, NULL, NULL);

package/external/libedhoc/externals/zcbor/tests/encode/test4_senml/src/main.c

@@ -6,7 +6,6 @@
 
 #include <zephyr/ztest.h>
 #include "senml_encode.h"
-#include "zcbor_debug.h" // Enables use of print functions when debugging tests.
 
 
 
@@ -33,23 +32,23 @@
 ZTEST(cbor_encode_test4, test_senml)
 {
 	struct lwm2m_senml input = {
-		._lwm2m_senml__record[0] = {
-			._record_bn = {._record_bn = {.value = "Foo", .len = 3}},
-			._record_bn_present = 1,
-			._record_bt = {._record_bt = 42},
-			._record_bt_present = 1,
-			._record_n = {._record_n = {.value = "Bar", .len = 3}},
-			._record_n_present = 1,
-			._record_t = {._record_t = 7},
-			._record_t_present = 1,
-			._record_union = {
-				._union_vb = true,
-				._record_union_choice = _union_vb,
+		.lwm2m_senml_record_m[0] = {
+			.record_bn = {.record_bn = {.value = "Foo", .len = 3}},
+			.record_bn_present = 1,
+			.record_bt = {.record_bt = 42},
+			.record_bt_present = 1,
+			.record_n = {.record_n = {.value = "Bar", .len = 3}},
+			.record_n_present = 1,
+			.record_t = {.record_t = 7},
+			.record_t_present = 1,
+			.record_union = {
+				.union_vb = true,
+				.record_union_choice = union_vb_c,
 			},
-			._record_union_present = 1,
-			._record__key_value_pair_count = 0,
+			.record_union_present = 1,
+			.record_key_value_pair_m_count = 0,
 		},
-		._lwm2m_senml__record_count = 1,
+		.lwm2m_senml_record_m_count = 1,
 	};
 	uint8_t payload[100];
 	size_t encode_len;

package/external/libedhoc/externals/zcbor/tests/fuzz/fuzz_everything.c

@@ -0,0 +1,12 @@
+#include "everything_decode.h"
+#include "main_entry.h"
+
+bool fuzz_one_input(const uint8_t *data, size_t size)
+{
+    size_t payload_len_out = 0;
+    struct EverythingUnion_r result;
+    bool ret = cbor_decode_EverythingUnion(data, size,
+                               &result,
+                               &payload_len_out);
+    return ret;
+}