edhoc 1.0.5 → 1.1.1

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

@@ -7,7 +7,6 @@
 #include <zephyr/ztest.h>
 #include "pet_decode.h"
 #include "serial/serial_recovery_decode.h"
-#include "zcbor_debug.h" // Enables use of print functions when debugging tests.
 
 uint8_t serial_rec_input1[] = {
 	/* "data" */
@@ -447,7 +446,7 @@ ZTEST(cbor_decode_test3, test_pet)
 	zassert_mem_equal("bar", pet.names[1].value, 3, "Expect first name 'bar'");
 	zassert_equal(8, pet.birthday.len, "Expect len 8 birthday");
 	zassert_mem_equal(exp_birthday, pet.birthday.value, 8, "Expect birthday");
-	zassert_equal(_Pet_species_dog, pet.species_choice, "Expect dog");
+	zassert_equal(Pet_species_dog_c, pet.species_choice, "Expect dog");
 }
 
 
@@ -483,23 +482,23 @@ ZTEST(cbor_decode_test3, test_serial1)
 {
 	struct Upload upload;
 	size_t decode_len;
-	bool ret = cbor_decode_Upload(serial_rec_input1,
+	int ret = cbor_decode_Upload(serial_rec_input1,
 			sizeof(serial_rec_input1), &upload, &decode_len);
-	zassert_equal(ZCBOR_SUCCESS, ret, "decoding failed.");
+	zassert_equal(ZCBOR_SUCCESS, ret, "decoding failed: %d.", ret);
 	zassert_equal(sizeof(serial_rec_input1), decode_len, NULL);
 
 	zassert_equal(5, upload.members_count,
 		"expect 5 members");
-	zassert_equal(_Member_data, upload.members[0].members
+	zassert_equal(Member_data_c, upload.members[0].members
 		.Member_choice, "expect data 1st");
-	zassert_equal(_Member_image, upload.members[1].members
+	zassert_equal(Member_image_c, upload.members[1].members
 		.Member_choice, "expect image 2nd");
-	zassert_equal(_Member_len, upload.members[2].members
+	zassert_equal(Member_len_c, upload.members[2].members
 		.Member_choice, "was %d\r\n", upload.members[2].members
 		.Member_choice);
-	zassert_equal(_Member_off, upload.members[3].members
+	zassert_equal(Member_off_c, upload.members[3].members
 		.Member_choice, "expect off 4th");
-	zassert_equal(_Member_sha, upload.members[4].members
+	zassert_equal(Member_sha_c, upload.members[4].members
 		.Member_choice, "expect sha 5th");
 }
 
@@ -507,22 +506,22 @@ ZTEST(cbor_decode_test3, test_serial2)
 {
 	struct Upload upload;
 	size_t decode_len;
-	bool ret = cbor_decode_Upload(serial_rec_input2,
+	int ret = cbor_decode_Upload(serial_rec_input2,
 			sizeof(serial_rec_input2), &upload, &decode_len);
-	zassert_equal(ZCBOR_SUCCESS, ret, "decoding failed.");
+	zassert_equal(ZCBOR_SUCCESS, ret, "decoding failed: %d.", ret);
 	zassert_equal(sizeof(serial_rec_input2), decode_len, NULL);
 
 	zassert_equal(5, upload.members_count,
 		"expect 5 members");
-	zassert_equal(_Member_data, upload.members[0].members
+	zassert_equal(Member_data_c, upload.members[0].members
 		.Member_choice, "expect data 1st");
-	zassert_equal(_Member_image, upload.members[1].members
+	zassert_equal(Member_image_c, upload.members[1].members
 		.Member_choice, "expect image 2nd");
-	zassert_equal(_Member_len, upload.members[2].members
+	zassert_equal(Member_len_c, upload.members[2].members
 		.Member_choice, "expect len 3rd");
-	zassert_equal(_Member_off, upload.members[3].members
+	zassert_equal(Member_off_c, upload.members[3].members
 		.Member_choice, "expect off 4th");
-	zassert_equal(_Member_sha, upload.members[4].members
+	zassert_equal(Member_sha_c, upload.members[4].members
 		.Member_choice, "expect sha 5th");
 }
 

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

@@ -8,7 +8,7 @@
 #include <math.h>
 #include <corner_cases.h>
 #include <zcbor_decode.h>
-#include <zcbor_debug.h> // Enables use of print functions when debugging tests.
+#include <zcbor_print.h>
 
 #define CONCAT_BYTE(a,b) a ## b
 
@@ -78,8 +78,9 @@ ZTEST(cbor_decode_test5, test_numbers2)
 {
 	size_t decode_len = 0xFFFFFFFF;
 	const uint8_t payload_numbers2[] = {
-		LIST(7),
+		LIST(8),
 			0x1A, 0x00, 0x12, 0x34, 0x56, // 0x123456
+			0x3A, 0x7F, 0xFF, 0xFF, 0xFF, // -0x80000000
 			0x1B, 0x01, 2, 3, 4, 5, 6, 7, 8, // 0x0102030405060708
 			0x1B, 0x11, 2, 3, 4, 5, 6, 7, 9, // 0x1102030405060709
 			0x00, // 0
@@ -89,8 +90,9 @@ ZTEST(cbor_decode_test5, test_numbers2)
 		END
 	};
 	const uint8_t payload_numbers2_1[] = {
-		LIST(7),
+		LIST(8),
 			0x1A, 0x00, 0x12, 0x34, 0x56, // 0x123456
+			0x1A, 0x7F, 0xFF, 0xFF, 0xFF, // 0x7FFFFFFF
 			0x3B, 0x01, 2, 3, 4, 5, 6, 7, 8, // -0x0102030405060709
 			0x1B, 0x11, 2, 3, 4, 5, 6, 7, 9, // 0x1102030405060709
 			0x1B, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xFFFFFFFFFFFFFFFF
@@ -100,8 +102,9 @@ ZTEST(cbor_decode_test5, test_numbers2)
 		END
 	};
 	const uint8_t payload_numbers2_inv2[] = {
-		LIST(7),
+		LIST(8),
 			0x1A, 0x00, 0x12, 0x34, 0x56, // 0x123456
+			0x1A, 0x7F, 0xFF, 0xFF, 0xFF, // 0x7FFFFFFF
 			0x1B, 0x01, 2, 3, 4, 5, 6, 7, 8, // 0x0102030405060708
 			0x1B, 0x11, 2, 3, 4, 5, 6, 7, 9, // 0x1102030405060709
 			0x1B, 0x11, 2, 3, 4, 5, 6, 7, 9, // 0x1102030405060709
@@ -111,8 +114,9 @@ ZTEST(cbor_decode_test5, test_numbers2)
 		END
 	};
 	const uint8_t payload_numbers2_inv3[] = {
-		LIST(7),
+		LIST(8),
 			0x1A, 0x00, 0x12, 0x34, 0x56, // 0x123456
+			0x1A, 0x7F, 0xFF, 0xFF, 0xFF, // 0x7FFFFFFF
 			0x1B, 0x01, 2, 3, 4, 5, 6, 7, 8, // 0x0102030405060708
 			0x1B, 0x11, 2, 3, 4, 5, 6, 7, 9, // 0x1102030405060709
 			0x1B, 0x11, 2, 3, 4, 5, 6, 7, 9, // 0x1102030405060709
@@ -122,8 +126,9 @@ ZTEST(cbor_decode_test5, test_numbers2)
 		END
 	};
 	const uint8_t payload_numbers2_inv4[] = {
-		LIST(7),
+		LIST(8),
 			0x1A, 0x00, 0x12, 0x34, 0x56, // 0x123456
+			0x1A, 0x7F, 0xFF, 0xFF, 0xFF, // 0x7FFFFFFF
 			0x1B, 0x01, 2, 3, 4, 5, 6, 7, 8, // 0x0102030405060708
 			0x1A, 0x00, 0x12, 0x34, 0x56, // 0x123456 INV
 			0x1B, 0x11, 2, 3, 4, 5, 6, 7, 9, // 0x1102030405060709
@@ -133,8 +138,9 @@ ZTEST(cbor_decode_test5, test_numbers2)
 		END
 	};
 	const uint8_t payload_numbers2_inv5[] = {
-		LIST(7),
+		LIST(8),
 			0x1A, 0x00, 0x12, 0x34, 0x56, // 0x123456
+			0x1A, 0x7F, 0xFF, 0xFF, 0xFF, // 0x7FFFFFFF
 			0x1B, 0x01, 2, 3, 4, 5, 6, 7, 8, // 0x0102030405060708
 			0x1B, 0x11, 2, 3, 4, 5, 6, 7, 9, // 0x1102030405060709
 			0x1B, 0x11, 2, 3, 4, 5, 6, 7, 9, // 0x1102030405060709
@@ -144,8 +150,9 @@ ZTEST(cbor_decode_test5, test_numbers2)
 		END
 	};
 	const uint8_t payload_numbers2_inv6[] = {
-		LIST(7),
+		LIST(8),
 			0x1A, 0x00, 0x12, 0x34, 0x56, // 0x123456
+			0x1A, 0x7F, 0xFF, 0xFF, 0xFF, // 0x7FFFFFFF
 			0x3B, 0x01, 2, 3, 4, 5, 6, 7, 8, // -0x0102030405060709
 			0x1B, 0x11, 2, 3, 4, 5, 6, 7, 9, // 0x1102030405060709
 			0x20, // -1 INV
@@ -155,8 +162,9 @@ ZTEST(cbor_decode_test5, test_numbers2)
 		END
 	};
 	const uint8_t payload_numbers2_inv7[] = {
-		LIST(7),
+		LIST(8),
 			0x1A, 0x00, 0x12, 0x34, 0x56, // 0x123456
+			0x1A, 0x7F, 0xFF, 0xFF, 0xFF, // 0x7FFFFFFF
 			0x1B, 0x01, 2, 3, 4, 5, 6, 7, 8, // 0x0102030405060708
 			0x1B, 0x11, 2, 3, 4, 5, 6, 7, 9, // 0x1102030405060709
 			0x00, // 0
@@ -165,27 +173,55 @@ ZTEST(cbor_decode_test5, test_numbers2)
 			0xD9, 0x04, 0xD3, 0x03, // #6.1235(3) INV
 		END
 	};
+	const uint8_t payload_numbers2_inv8[] = {
+		LIST(8),
+			0x1A, 0x00, 0x12, 0x34, 0x56, // 0x123456
+			0x3A, 0x80, 0x00, 0x00, 0x00, // -0x80000001 INV
+			0x1B, 0x01, 2, 3, 4, 5, 6, 7, 8, // 0x0102030405060708
+			0x1B, 0x11, 2, 3, 4, 5, 6, 7, 9, // 0x1102030405060709
+			0x00, // 0
+			0x3A, 0x80, 0x00, 0x00, 0x00, // -0x8000_0001
+			0x3A, 0x7F, 0xFF, 0xFF, 0xFF, // -0x8000_0000
+			0xD9, 0x04, 0xD2, 0x03, // #6.1234(3)
+		END
+	};
+	const uint8_t payload_numbers2_inv9[] = {
+		LIST(8),
+			0x1A, 0x00, 0x12, 0x34, 0x56, // 0x123456
+			0x1A, 0x80, 0x00, 0x00, 0x00, // 0x80000000 INV
+			0x1B, 0x01, 2, 3, 4, 5, 6, 7, 8, // 0x0102030405060708
+			0x1B, 0x11, 2, 3, 4, 5, 6, 7, 9, // 0x1102030405060709
+			0x00, // 0
+			0x3A, 0x80, 0x00, 0x00, 0x00, // -0x8000_0001
+			0x3A, 0x7F, 0xFF, 0xFF, 0xFF, // -0x8000_0000
+			0xD9, 0x04, 0xD2, 0x03, // #6.1234(3)
+		END
+	};
 	struct Numbers2 numbers2;
+	int ret;
 
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_Numbers2(payload_numbers2,
 		sizeof(payload_numbers2), &numbers2, &decode_len), NULL);
 
 	zassert_equal(0x123456, numbers2.threebytes, NULL);
+	zassert_equal(-0x80000000L, numbers2.int32, NULL);
 	zassert_equal(0x0102030405060708, numbers2.big_int, NULL);
 	zassert_equal(0x1102030405060709, numbers2.big_uint, NULL);
 	zassert_equal(0, numbers2.big_uint2, NULL);
 	zassert_equal(3, numbers2.tagged_int, NULL);
 
-	zassert_equal(ZCBOR_SUCCESS, cbor_decode_Numbers2(payload_numbers2_1,
-		sizeof(payload_numbers2_1), &numbers2, &decode_len), NULL);
+	ret = cbor_decode_Numbers2(payload_numbers2_1,
+		sizeof(payload_numbers2_1), &numbers2, &decode_len);
+	zassert_equal(ZCBOR_SUCCESS, ret, "%d\r\n", ret);
 
 	zassert_equal(0x123456, numbers2.threebytes, NULL);
+	zassert_equal(0x7FFFFFFFL, numbers2.int32, NULL);
 	zassert_equal(-0x0102030405060709, numbers2.big_int, NULL);
 	zassert_equal(0x1102030405060709, numbers2.big_uint, NULL);
 	zassert_equal(0xFFFFFFFFFFFFFFFF, numbers2.big_uint2, NULL);
 	zassert_equal(3, numbers2.tagged_int, NULL);
 
-	int ret = cbor_decode_Numbers2(payload_numbers2_inv2,
+	ret = cbor_decode_Numbers2(payload_numbers2_inv2,
 		sizeof(payload_numbers2_inv2), &numbers2, &decode_len);
 	zassert_equal(ZCBOR_ERR_WRONG_VALUE, ret, "%d\r\n", ret);
 
@@ -204,6 +240,15 @@ ZTEST(cbor_decode_test5, test_numbers2)
 
 	zassert_equal(ZCBOR_ERR_WRONG_VALUE, cbor_decode_Numbers2(payload_numbers2_inv7,
 		sizeof(payload_numbers2_inv7), &numbers2, &decode_len), NULL);
+
+	ret = cbor_decode_Numbers2(payload_numbers2_inv8,
+		sizeof(payload_numbers2_inv8), &numbers2, &decode_len);
+	zassert_equal(sizeof(numbers2.int32) == 4 ? ZCBOR_ERR_INT_SIZE : ZCBOR_ERR_WRONG_RANGE,
+		ret, "%d\r\n", ret);
+
+	zassert_equal(sizeof(numbers2.int32) == 4 ? ZCBOR_ERR_INT_SIZE : ZCBOR_ERR_WRONG_RANGE,
+		cbor_decode_Numbers2(payload_numbers2_inv9,
+		sizeof(payload_numbers2_inv9), &numbers2, &decode_len), NULL);
 }
 
 
@@ -217,19 +262,19 @@ ZTEST(cbor_decode_test5, test_tagged_union)
 	const uint8_t payload_tagged_union2[] = {0xD9, 0x09, 0x29, 0x10};
 	const uint8_t payload_tagged_union3_inv[] = {0xD9, 0x10, 0xE1, 0x10};
 
-	struct TaggedUnion_ result;
+	struct TaggedUnion_r result;
 
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_TaggedUnion(payload_tagged_union1,
 		sizeof(payload_tagged_union1), &result, &decode_len), "%d\r\n");
 
 	zassert_equal(sizeof(payload_tagged_union1), decode_len, NULL);
-	zassert_equal(_TaggedUnion_bool, result.TaggedUnion_choice, NULL);
-	zassert_true(result._bool, NULL);
+	zassert_equal(TaggedUnion_bool_c, result.TaggedUnion_choice, NULL);
+	zassert_true(result.Bool, NULL);
 
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_TaggedUnion(payload_tagged_union2,
 		sizeof(payload_tagged_union2), &result, &decode_len), NULL);
 
-	zassert_equal(_TaggedUnion_uint, result.TaggedUnion_choice, NULL);
+	zassert_equal(TaggedUnion_uint_c, result.TaggedUnion_choice, NULL);
 	zassert_equal(0x10, result.uint, NULL);
 
 	zassert_equal(ZCBOR_ERR_WRONG_TYPE, cbor_decode_TaggedUnion(payload_tagged_union3_inv,
@@ -658,43 +703,43 @@ ZTEST(cbor_decode_test5, test_union)
 		0x03, 0x23, 0x03, 0x23, 0x03, 0x23}; /* Too many */
 	size_t decode_len;
 
-	struct Union_ _union;
+	struct Union_r union_r;
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_Union(payload_union1, sizeof(payload_union1),
-				&_union, NULL), NULL);
-	zassert_equal(_Union__Group, _union.Union_choice, NULL);
+				&union_r, NULL), NULL);
+	zassert_equal(Union_Group_m_c, union_r.Union_choice, NULL);
 
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_Union(payload_union2, sizeof(payload_union2),
-				&_union, NULL), NULL);
-	zassert_equal(_Union__MultiGroup, _union.Union_choice, NULL);
-	zassert_equal(1, _union._MultiGroup.MultiGroup_count, "was %d\r\n", _union._MultiGroup.MultiGroup_count);
+				&union_r, NULL), NULL);
+	zassert_equal(Union_MultiGroup_m_c, union_r.Union_choice, NULL);
+	zassert_equal(1, union_r.MultiGroup_m.MultiGroup_count, "was %d\r\n", union_r.MultiGroup_m.MultiGroup_count);
 
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_Union(payload_union3, sizeof(payload_union3),
-				&_union, NULL), NULL);
-	zassert_equal(_Union__uint3, _union.Union_choice, NULL);
+				&union_r, NULL), NULL);
+	zassert_equal(Union_uint3_l_c, union_r.Union_choice, NULL);
 
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_Union(payload_union4, sizeof(payload_union4),
-				&_union, NULL), NULL);
-	zassert_equal(_Union_hello_tstr, _union.Union_choice, NULL);
+				&union_r, NULL), NULL);
+	zassert_equal(Union_hello_tstr_c, union_r.Union_choice, NULL);
 
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_Union(payload_union6, sizeof(payload_union6),
-				&_union, &decode_len), NULL);
-	zassert_equal(_Union__MultiGroup, _union.Union_choice, NULL);
-	zassert_equal(6, _union._MultiGroup.MultiGroup_count, NULL);
+				&union_r, &decode_len), NULL);
+	zassert_equal(Union_MultiGroup_m_c, union_r.Union_choice, NULL);
+	zassert_equal(6, union_r.MultiGroup_m.MultiGroup_count, NULL);
 	zassert_equal(12, decode_len, NULL);
 
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_Union(payload_union7_long, sizeof(payload_union7_long),
-				&_union, &decode_len), NULL);
+				&union_r, &decode_len), NULL);
 	zassert_equal(2, decode_len, NULL);
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_Union(payload_union8_long, sizeof(payload_union8_long),
-				&_union, &decode_len), NULL);
+				&union_r, &decode_len), NULL);
 	zassert_equal(2, decode_len, NULL);
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_Union(payload_union9_long, sizeof(payload_union9_long),
-				&_union, &decode_len), NULL);
+				&union_r, &decode_len), NULL);
 	zassert_equal(2, decode_len, NULL);
 
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_Union(payload_union10_inv, sizeof(payload_union10_inv),
-				&_union, &decode_len), NULL);
-	zassert_equal(6, _union._MultiGroup.MultiGroup_count, NULL);
+				&union_r, &decode_len), NULL);
+	zassert_equal(6, union_r.MultiGroup_m.MultiGroup_count, NULL);
 	zassert_equal(12, decode_len, NULL);
 }
 
@@ -721,9 +766,9 @@ ZTEST(cbor_decode_test5, test_levels)
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_Level1(payload_levels1,
 		sizeof(payload_levels1), &level1, NULL), NULL);
 
-	zassert_equal(2, level1._Level3_count, NULL);
-	zassert_equal(4, level1._Level3[0]._Level4_count, NULL);
-	zassert_equal(4, level1._Level3[1]._Level4_count, NULL);
+	zassert_equal(2, level1.Level3_m_count, NULL);
+	zassert_equal(4, level1.Level3_m[0].Level4_m_count, NULL);
+	zassert_equal(4, level1.Level3_m[1].Level4_m_count, NULL);
 }
 
 
@@ -770,13 +815,13 @@ ZTEST(cbor_decode_test5, test_map)
 
 	struct Map map;
 
-	zassert_equal(_union_nintuint, -8,
+	zassert_equal(union_nintuint_c, -8,
 		"The union_int optimization seems to not be working.\r\n");
 
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_Map(payload_map1, sizeof(payload_map1),
 			&map, NULL), NULL);
 	zassert_false(map.listkey, NULL);
-	zassert_equal(_union_uint7uint, map.union_choice, NULL);
+	zassert_equal(union_uint7uint_c, map.union_choice, NULL);
 	zassert_equal(1, map.uint7uint, NULL);
 	zassert_equal(2, map.twotothree_count, NULL);
 	zassert_equal(5, map.twotothree[0].twotothree.len, NULL);
@@ -790,7 +835,7 @@ ZTEST(cbor_decode_test5, test_map)
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_Map(payload_map3, sizeof(payload_map3),
 			&map, NULL), NULL);
 	zassert_true(map.listkey, NULL);
-	zassert_equal(_union_uint7uint, map.union_choice, NULL);
+	zassert_equal(union_uint7uint_c, map.union_choice, NULL);
 	zassert_equal(1, map.uint7uint, NULL);
 	zassert_equal(3, map.twotothree_count, NULL);
 	zassert_equal(5, map.twotothree[0].twotothree.len, NULL);
@@ -810,7 +855,7 @@ ZTEST(cbor_decode_test5, test_map)
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_Map(payload_map5, sizeof(payload_map5),
 			&map, NULL), NULL);
 	zassert_false(map.listkey, NULL);
-	zassert_equal(_union_nintuint, map.union_choice, NULL);
+	zassert_equal(union_nintuint_c, map.union_choice, NULL);
 	zassert_equal(1, map.nintuint, NULL);
 	zassert_equal(2, map.twotothree_count, NULL);
 }
@@ -837,7 +882,7 @@ ZTEST(cbor_decode_test5, test_empty_map)
 	const uint8_t payload4[] = {MAP(0), END MAP(0), END MAP(0), END};
 	size_t num_decode;
 
-	ZCBOR_STATE_D(state, 0, payload4, sizeof(payload4), 3);
+	ZCBOR_STATE_D(state, 0, payload4, sizeof(payload4), 3, 0);
 
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_EmptyMap(payload1, sizeof(payload1), NULL, NULL), NULL);
 #ifdef TEST_INDEFINITE_LENGTH_ARRAYS
@@ -904,30 +949,30 @@ ZTEST(cbor_decode_test5, test_nested_map_list_map)
 	int ret = cbor_decode_NestedMapListMap(payload_nested_mlm1,
 			sizeof(payload_nested_mlm1), &maplistmap, NULL);
 	zassert_equal(ZCBOR_SUCCESS, ret, "%d\r\n", ret);
-	zassert_equal(1, maplistmap._map_count, NULL);
-	zassert_equal(0, maplistmap._map[0].map_count, NULL);
+	zassert_equal(1, maplistmap.map_l_count, NULL);
+	zassert_equal(0, maplistmap.map_l[0].map_count, NULL);
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_NestedMapListMap(payload_nested_mlm2,
 			sizeof(payload_nested_mlm2), &maplistmap, NULL), NULL);
-	zassert_equal(1, maplistmap._map_count, NULL);
-	zassert_equal(1, maplistmap._map[0].map_count, NULL);
+	zassert_equal(1, maplistmap.map_l_count, NULL);
+	zassert_equal(1, maplistmap.map_l[0].map_count, NULL);
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_NestedMapListMap(payload_nested_mlm3,
 			sizeof(payload_nested_mlm3), &maplistmap, NULL), NULL);
-	zassert_equal(1, maplistmap._map_count, NULL);
-	zassert_equal(2, maplistmap._map[0].map_count, NULL);
+	zassert_equal(1, maplistmap.map_l_count, NULL);
+	zassert_equal(2, maplistmap.map_l[0].map_count, NULL);
 	ret = cbor_decode_NestedMapListMap(payload_nested_mlm4_inv,
 			sizeof(payload_nested_mlm4_inv), &maplistmap, NULL);
 	zassert_equal(ZCBOR_ERR_ITERATIONS, ret, "%d\r\n", ret);
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_NestedMapListMap(payload_nested_mlm5,
 			sizeof(payload_nested_mlm5), &maplistmap, NULL), NULL);
-	zassert_equal(2, maplistmap._map_count, NULL);
-	zassert_equal(0, maplistmap._map[0].map_count, NULL);
-	zassert_equal(0, maplistmap._map[1].map_count, NULL);
+	zassert_equal(2, maplistmap.map_l_count, NULL);
+	zassert_equal(0, maplistmap.map_l[0].map_count, NULL);
+	zassert_equal(0, maplistmap.map_l[1].map_count, NULL);
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_NestedMapListMap(payload_nested_mlm6,
 			sizeof(payload_nested_mlm6), &maplistmap, NULL), NULL);
-	zassert_equal(3, maplistmap._map_count, NULL);
-	zassert_equal(0, maplistmap._map[0].map_count, NULL);
-	zassert_equal(0, maplistmap._map[1].map_count, NULL);
-	zassert_equal(2, maplistmap._map[2].map_count, NULL);
+	zassert_equal(3, maplistmap.map_l_count, NULL);
+	zassert_equal(0, maplistmap.map_l[0].map_count, NULL);
+	zassert_equal(0, maplistmap.map_l[1].map_count, NULL);
+	zassert_equal(2, maplistmap.map_l[2].map_count, NULL);
 }
 
 
@@ -1293,18 +1338,18 @@ ZTEST(cbor_decode_test5, test_unabstracted)
 					sizeof(payload_unabstracted0),
 					&result_unabstracted, &out_len), NULL);
 	zassert_equal(result_unabstracted.unabstractedunion1_choice,
-			_Unabstracted_unabstractedunion1_choice1, NULL);
+			Unabstracted_unabstractedunion1_choice1_c, NULL);
 	zassert_equal(result_unabstracted.unabstractedunion2_choice,
-			_Unabstracted_unabstractedunion2_uint3, NULL);
+			Unabstracted_unabstractedunion2_uint3_c, NULL);
 	zassert_equal(sizeof(payload_unabstracted0), out_len, NULL);
 
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_Unabstracted(payload_unabstracted1,
 					sizeof(payload_unabstracted1),
 					&result_unabstracted, &out_len), NULL);
 	zassert_equal(result_unabstracted.unabstractedunion1_choice,
-			_Unabstracted_unabstractedunion1_choice2, NULL);
+			Unabstracted_unabstractedunion1_choice2_c, NULL);
 	zassert_equal(result_unabstracted.unabstractedunion2_choice,
-			_Unabstracted_unabstractedunion2_choice4, NULL);
+			Unabstracted_unabstractedunion2_choice4_c, NULL);
 	zassert_equal(sizeof(payload_unabstracted1), out_len, NULL);
 
 	int ret = cbor_decode_Unabstracted(payload_unabstracted2_inv,
@@ -1360,13 +1405,13 @@ ZTEST(cbor_decode_test5, test_doublemap)
 					&result_doublemap, &out_len), NULL);
 	zassert_equal(result_doublemap.uintmap_count, 2, NULL);
 	zassert_equal(result_doublemap.uintmap[0].uintmap_key, 1, NULL);
-	zassert_true(result_doublemap.uintmap[0]._MyKeys.uint1int_present, NULL);
-	zassert_equal(result_doublemap.uintmap[0]._MyKeys.uint1int.uint1int, 1, NULL);
-	zassert_false(result_doublemap.uintmap[0]._MyKeys.uint2int_present, NULL);
+	zassert_true(result_doublemap.uintmap[0].MyKeys_m.uint1int_present, NULL);
+	zassert_equal(result_doublemap.uintmap[0].MyKeys_m.uint1int.uint1int, 1, NULL);
+	zassert_false(result_doublemap.uintmap[0].MyKeys_m.uint2int_present, NULL);
 	zassert_equal(result_doublemap.uintmap[1].uintmap_key, 2, NULL);
-	zassert_false(result_doublemap.uintmap[1]._MyKeys.uint1int_present, NULL);
-	zassert_true(result_doublemap.uintmap[1]._MyKeys.uint2int_present, NULL);
-	zassert_equal(result_doublemap.uintmap[1]._MyKeys.uint2int.uint2int, 2, NULL);
+	zassert_false(result_doublemap.uintmap[1].MyKeys_m.uint1int_present, NULL);
+	zassert_true(result_doublemap.uintmap[1].MyKeys_m.uint2int_present, NULL);
+	zassert_equal(result_doublemap.uintmap[1].MyKeys_m.uint2int.uint2int, 2, NULL);
 
 	int ret = cbor_decode_DoubleMap(payload_doublemap1_inv,
 					sizeof(payload_doublemap1_inv),
@@ -1814,22 +1859,22 @@ ZTEST(cbor_decode_test5, test_map_length)
 		sizeof(map_length_payload2), &result, &num_decode), NULL);
 	zassert_equal(sizeof(map_length_payload2), num_decode, NULL);
 	zassert_true(result.end_device_array_present, NULL);
-	zassert_equal(0, result.end_device_array._uuid_count, NULL);
+	zassert_equal(0, result.end_device_array.uuid_m_count, NULL);
 
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_MapLength(map_length_payload3,
 		sizeof(map_length_payload3), &result, &num_decode), NULL);
 	zassert_equal(sizeof(map_length_payload3), num_decode, NULL);
 	zassert_true(result.end_device_array_present, NULL);
-	zassert_equal(1, result.end_device_array._uuid_count, NULL);
+	zassert_equal(1, result.end_device_array.uuid_m_count, NULL);
 
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_MapLength(map_length_payload4,
 		sizeof(map_length_payload4), &result, &num_decode), NULL);
 	zassert_equal(sizeof(map_length_payload4), num_decode, NULL);
 	zassert_true(result.end_device_array_present, NULL);
-	zassert_equal(2, result.end_device_array._uuid_count, NULL);
-	zassert_equal(16, result.end_device_array._uuid[0].len, NULL);
-	zassert_equal(16, result.end_device_array._uuid[1].len, NULL);
-	zassert_equal(8, result.end_device_array._uuid[1].value[8], NULL);
+	zassert_equal(2, result.end_device_array.uuid_m_count, NULL);
+	zassert_equal(16, result.end_device_array.uuid_m[0].len, NULL);
+	zassert_equal(16, result.end_device_array.uuid_m[1].len, NULL);
+	zassert_equal(8, result.end_device_array.uuid_m[1].value[8], NULL);
 
 	zassert_equal(ZCBOR_ERR_WRONG_RANGE, cbor_decode_MapLength(map_length_payload5_inv,
 		sizeof(map_length_payload5_inv), &result, &num_decode), NULL);
@@ -1879,48 +1924,48 @@ ZTEST(cbor_decode_test5, test_union_int)
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_UnionInt1(union_int_payload1,
 		sizeof(union_int_payload1), &result1, &num_decode), NULL);
 	zassert_equal(sizeof(union_int_payload1), num_decode, NULL);
-	zassert_equal(result1.union_choice, _UnionInt1__union_uint1, NULL);
+	zassert_equal(result1.union_choice, UnionInt1_union_uint1_l_c, NULL);
 
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_UnionInt2(union_int_payload1,
 		sizeof(union_int_payload1), &result2, &num_decode), NULL);
 	zassert_equal(sizeof(union_int_payload1), num_decode, NULL);
-	zassert_equal(result2.union_choice, _union__uint5, NULL);
+	zassert_equal(result2.union_choice, union_uint5_l_c, NULL);
 
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_UnionInt1(union_int_payload2,
 		sizeof(union_int_payload2), &result1, &num_decode), NULL);
 	zassert_equal(sizeof(union_int_payload2), num_decode, NULL);
-	zassert_equal(result1.union_choice, _UnionInt1__union_uint2, NULL);
+	zassert_equal(result1.union_choice, UnionInt1_union_uint2_l_c, NULL);
 	zassert_equal(result1.bstr.len, 16, NULL);
 	zassert_mem_equal(result1.bstr.value, "This is thousand", 16, NULL);
 
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_UnionInt2(union_int_payload2,
 		sizeof(union_int_payload2), &result2, &num_decode), NULL);
 	zassert_equal(sizeof(union_int_payload2), num_decode, NULL);
-	zassert_equal(result2.union_choice, _union__uint1000, NULL);
+	zassert_equal(result2.union_choice, union_uint1000_l_c, NULL);
 	zassert_equal(result2.bstr.len, 16, NULL);
 	zassert_mem_equal(result2.bstr.value, "This is thousand", 16, NULL);
 
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_UnionInt1(union_int_payload3,
 		sizeof(union_int_payload3), &result1, &num_decode), NULL);
 	zassert_equal(sizeof(union_int_payload3), num_decode, NULL);
-	zassert_equal(result1.union_choice, _UnionInt1__union_uint3, NULL);
-	zassert_equal(result1._number.number_choice, _number_int, NULL);
-	zassert_equal(result1._number._int, 1, NULL);
+	zassert_equal(result1.union_choice, UnionInt1_union_uint3_l_c, NULL);
+	zassert_equal(result1.number_m.number_choice, number_int_c, NULL);
+	zassert_equal(result1.number_m.Int, 1, NULL);
 
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_UnionInt2(union_int_payload3,
 		sizeof(union_int_payload3), &result2, &num_decode), NULL);
 	zassert_equal(sizeof(union_int_payload3), num_decode, NULL);
-	zassert_equal(result2.union_choice, _union__nint, NULL);
-	zassert_equal(result2._number.number_choice, _number_int, NULL);
-	zassert_equal(result2._number._int, 1, NULL);
+	zassert_equal(result2.union_choice, union_nint_l_c, NULL);
+	zassert_equal(result2.number_m.number_choice, number_int_c, NULL);
+	zassert_equal(result2.number_m.Int, 1, NULL);
 
 	int err = cbor_decode_UnionInt2(union_int_payload6,
 		sizeof(union_int_payload6), &result2, &num_decode);
 	zassert_equal(ZCBOR_SUCCESS, err, "%d\r\n", err);
 	zassert_equal(sizeof(union_int_payload6), num_decode, NULL);
-	zassert_equal(result2.union_choice, _UnionInt2_union__Structure_One, NULL);
-	zassert_equal(result2._Structure_One.some_array.len, 2, NULL);
-	zassert_mem_equal(result2._Structure_One.some_array.value, "hi", 2, NULL);
+	zassert_equal(result2.union_choice, UnionInt2_union_Structure_One_m_c, NULL);
+	zassert_equal(result2.Structure_One_m.some_array.len, 2, NULL);
+	zassert_mem_equal(result2.Structure_One_m.some_array.value, "hi", 2, NULL);
 
 	err = cbor_decode_UnionInt1(union_int_payload4_inv,
 		sizeof(union_int_payload4_inv), &result1, &num_decode);
@@ -1975,7 +2020,27 @@ ZTEST(cbor_decode_test5, test_intmax)
 		0x1B, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
 		END
 	};
+	uint8_t intmax3_payload1[] = {LIST(3),
+		0x18, 254,
+		0x19, 0xFF, 0xFE,
+		MAP(1),
+			0x38, 127,
+			0x58, 127,
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+		END
+		END
+	};
+
+
 	struct Intmax2 result2;
+	struct Intmax3 result3;
 	size_t num_decode;
 
 	zassert_equal(ZCBOR_SUCCESS, cbor_decode_Intmax1(intmax1_payload1,
@@ -2005,6 +2070,85 @@ ZTEST(cbor_decode_test5, test_intmax)
 	zassert_equal(result2.UINT_32, UINT32_MAX, NULL);
 	zassert_equal(result2.INT_64, INT64_MAX, NULL);
 	zassert_equal(result2.UINT_64, UINT64_MAX, NULL);
+
+	int res = cbor_decode_Intmax3(intmax3_payload1,
+		sizeof(intmax3_payload1), &result3, &num_decode);
+	zassert_equal(ZCBOR_SUCCESS, res, "%s\n", zcbor_error_str(res));
+	zassert_equal(sizeof(intmax3_payload1), num_decode, NULL);
+	zassert_equal(result3.union_choice, Intmax3_union_uint254_c, NULL);
+	zassert_equal(result3.Int, 65534, NULL);
+	zassert_equal(result3.nintbstr.len, 127, NULL);
 }
 
+
+/* Test that zcbor generates variable names that don't contain unsupported characters. */
+ZTEST(cbor_decode_test5, test_invalid_identifiers)
+{
+	struct InvalidIdentifiers result;
+	uint8_t invalid_identifiers_payload1[] = {
+		LIST(3),
+		0x64, '1', 'o', 'n', 'e',
+		0x02, /* Ø */
+		0x67, '{', '[', 'a', '-', 'z', ']', '}',
+		END
+	};
+
+	zassert_equal(ZCBOR_SUCCESS, cbor_decode_InvalidIdentifiers(invalid_identifiers_payload1,
+		sizeof(invalid_identifiers_payload1), &result, NULL), NULL);
+	zassert_true(result._1one_tstr_present, NULL);
+	zassert_true(result.__present, NULL);
+	zassert_true(result.a_z_tstr_present, NULL);
+}
+
+
+ZTEST(cbor_decode_test5, test_uint64_list)
+{
+	uint8_t uint64_list_payload1[] = {LIST(8),
+		0x10,
+		0x18, 0x20,
+		0x19, 0x12, 0x34,
+		0x1a, 0x12, 0x34, 0x56, 0x78,
+		0x1b, 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0,
+		0x3b, 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0,
+		0x1b, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
+		0x3b, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xee,
+		END
+	};
+
+	struct Uint64List result;
+	size_t num_decode;
+
+	zassert_equal(ZCBOR_SUCCESS, cbor_decode_Uint64List(uint64_list_payload1,
+		sizeof(uint64_list_payload1), &result, &num_decode), NULL);
+	zassert_equal(sizeof(uint64_list_payload1), num_decode, NULL);
+
+	zassert_equal(5, result.uint64_count, NULL);
+	zassert_equal(0x10, result.uint64[0], NULL);
+	zassert_equal(0x20, result.uint64[1], NULL);
+	zassert_equal(0x1234, result.uint64[2], NULL);
+	zassert_equal(0x12345678, result.uint64[3], NULL);
+	zassert_equal(0x123456789abcdef0, result.uint64[4], NULL);
+}
+
+
+ZTEST(cbor_decode_test5, test_bstr_size)
+{
+	uint8_t bstr_size_payload1[] = {MAP(1),
+		0x61, 's',
+		0x4c, 0x00, 0x11, 0x22, 0x33, 0x44, 0x55,
+		0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb,
+		END
+	};
+
+	struct BstrSize result;
+	size_t num_decode;
+
+	zassert_equal(ZCBOR_SUCCESS, cbor_decode_BstrSize(bstr_size_payload1,
+		sizeof(bstr_size_payload1), &result, &num_decode), NULL);
+	zassert_equal(sizeof(bstr_size_payload1), num_decode, NULL);
+
+	zassert_equal(12, result.bstr12_m.s.len, NULL);
+}
+
+
 ZTEST_SUITE(cbor_decode_test5, NULL, NULL, NULL, NULL, NULL);