Merge pull request #61 from oyvindronningstad/zcbor-0.8.0

zcbor 0.8.0
eriptic · Apr 14, 2024 · bbca526 · bbca526
2 parents 5024d8c + f1443b4
commit bbca526
Show file tree

Hide file tree

Showing 82 changed files with 1,172 additions and 1,251 deletions.
diff --git a/externals/zcbor b/externals/zcbor
diff --git a/inc/cbor/edhoc_decode_bstr_type.h b/inc/cbor/edhoc_decode_bstr_type.h
@@ -1,5 +1,5 @@
 /*
- * Generated using zcbor version 0.7.0
+ * Generated using zcbor version 0.8.0
  * https://github.com/NordicSemiconductor/zcbor
  * Generated with a --default-max-qty of 3
  */

diff --git a/inc/cbor/edhoc_decode_bstr_type_types.h b/inc/cbor/edhoc_decode_bstr_type_types.h
@@ -1,5 +1,5 @@
 /*
- * Generated using zcbor version 0.7.0
+ * Generated using zcbor version 0.8.0
  * https://github.com/NordicSemiconductor/zcbor
  * Generated with a --default-max-qty of 3
  */

diff --git a/inc/cbor/edhoc_decode_cert.h b/inc/cbor/edhoc_decode_cert.h
@@ -1,5 +1,5 @@
 /*
- * Generated using zcbor version 0.7.0
+ * Generated using zcbor version 0.8.0
  * https://github.com/NordicSemiconductor/zcbor
  * Generated with a --default-max-qty of 3
  */
@@ -21,8 +21,12 @@ extern "C" {
 #error "The type file was generated with a different default_max_qty than this file"
 #endif
 
-int cbor_decode_cert(const uint8_t *payload, size_t payload_len,
-		     struct cert *result, size_t *payload_len_out);
+
+int cbor_decode_cert(
+		const uint8_t *payload, size_t payload_len,
+		struct cert *result,
+		size_t *payload_len_out);
+
 
 #ifdef __cplusplus
 }

diff --git a/inc/cbor/edhoc_decode_cert_types.h b/inc/cbor/edhoc_decode_cert_types.h
@@ -1,5 +1,5 @@
 /*
- * Generated using zcbor version 0.7.0
+ * Generated using zcbor version 0.8.0
  * https://github.com/NordicSemiconductor/zcbor
  * Generated with a --default-max-qty of 3
  */
@@ -26,17 +26,17 @@ extern "C" {
 #define DEFAULT_MAX_QTY 3
 
 struct cert {
-	int32_t _cert_type;
-	int32_t _cert_serial_number;
-	struct zcbor_string _cert_issuer;
-	int32_t _cert_validity_not_before;
-	int32_t _cert_validity_not_after;
-	struct zcbor_string _cert_subject;
-	int32_t _cert_subject_public_key_algorithm;
-	struct zcbor_string _cert_pk;
-	int32_t _cert_extensions;
-	int32_t _cert_issuer_signature_algorithm;
-	struct zcbor_string _cert_signature;
+	int32_t cert_type;
+	int32_t cert_serial_number;
+	struct zcbor_string cert_issuer;
+	int32_t cert_validity_not_before;
+	int32_t cert_validity_not_after;
+	struct zcbor_string cert_subject;
+	int32_t cert_subject_public_key_algorithm;
+	struct zcbor_string cert_pk;
+	int32_t cert_extensions;
+	int32_t cert_issuer_signature_algorithm;
+	struct zcbor_string cert_signature;
 };
 
 #ifdef __cplusplus

diff --git a/inc/cbor/edhoc_decode_id_cred_x.h b/inc/cbor/edhoc_decode_id_cred_x.h
@@ -1,5 +1,5 @@
 /*
- * Generated using zcbor version 0.7.0
+ * Generated using zcbor version 0.8.0
  * https://github.com/NordicSemiconductor/zcbor
  * Generated with a --default-max-qty of 3
  */

diff --git a/inc/cbor/edhoc_decode_id_cred_x_types.h b/inc/cbor/edhoc_decode_id_cred_x_types.h
@@ -1,5 +1,5 @@
 /*
- * Generated using zcbor version 0.7.0
+ * Generated using zcbor version 0.8.0
  * https://github.com/NordicSemiconductor/zcbor
  * Generated with a --default-max-qty of 3
  */
@@ -25,84 +25,84 @@ extern "C" {
  */
 #define DEFAULT_MAX_QTY 3
 
-struct id_cred_x_map_kid_ {
+struct id_cred_x_map_kid_r {
 	union {
-		int32_t _id_cred_x_map_kid_int;
-		struct zcbor_string _id_cred_x_map_kid_bstr;
+		int32_t id_cred_x_map_kid_int;
+		struct zcbor_string id_cred_x_map_kid_bstr;
 	};
 	enum {
-		_id_cred_x_map_kid_int,
-		_id_cred_x_map_kid_bstr,
-	} _id_cred_x_map_kid_choice;
+		id_cred_x_map_kid_int_c,
+		id_cred_x_map_kid_bstr_c,
+	} id_cred_x_map_kid_choice;
 };
 
 struct id_cred_x_map_x5bag {
-	struct zcbor_string _id_cred_x_map_x5bag;
+	struct zcbor_string id_cred_x_map_x5bag;
 };
 
 struct id_cred_x_map_x5chain {
-	struct zcbor_string _id_cred_x_map_x5chain;
+	struct zcbor_string id_cred_x_map_x5chain;
 };
 
-struct id_cred_x_map_x5t_ {
+struct id_cred_x_map_x5t_r {
 	union {
-		int32_t _id_cred_x_map_x5t_alg_int;
-		struct zcbor_string _id_cred_x_map_x5t_alg_tstr;
+		int32_t id_cred_x_map_x5t_alg_int;
+		struct zcbor_string id_cred_x_map_x5t_alg_tstr;
 	};
 	enum {
-		_id_cred_x_map_x5t_alg_int,
-		_id_cred_x_map_x5t_alg_tstr,
-	} _id_cred_x_map_x5t_alg_choice;
-	struct zcbor_string _id_cred_x_map_x5t_hash;
+		id_cred_x_map_x5t_alg_int_c,
+		id_cred_x_map_x5t_alg_tstr_c,
+	} id_cred_x_map_x5t_alg_choice;
+	struct zcbor_string id_cred_x_map_x5t_hash;
 };
 
 struct id_cred_x_map_x5u {
-	struct zcbor_string _id_cred_x_map_x5u;
+	struct zcbor_string id_cred_x_map_x5u;
 };
 
 struct id_cred_x_map_c5b {
-	struct zcbor_string _id_cred_x_map_c5b;
+	struct zcbor_string id_cred_x_map_c5b;
 };
 
 struct id_cred_x_map_c5c {
-	struct zcbor_string _id_cred_x_map_c5c;
+	struct zcbor_string id_cred_x_map_c5c;
 };
 
-struct id_cred_x_map_c5t_ {
+struct id_cred_x_map_c5t_r {
 	union {
-		int32_t _id_cred_x_map_c5t_alg_int;
-		struct zcbor_string _id_cred_x_map_c5t_alg_tstr;
+		int32_t id_cred_x_map_c5t_alg_int;
+		struct zcbor_string id_cred_x_map_c5t_alg_tstr;
 	};
 	enum {
-		_id_cred_x_map_c5t_alg_int,
-		_id_cred_x_map_c5t_alg_tstr,
-	} _id_cred_x_map_c5t_alg_choice;
-	struct zcbor_string _id_cred_x_map_c5t_hash;
+		id_cred_x_map_c5t_alg_int_c,
+		id_cred_x_map_c5t_alg_tstr_c,
+	} id_cred_x_map_c5t_alg_choice;
+	struct zcbor_string id_cred_x_map_c5t_hash;
 };
 
 struct id_cred_x_map_c5u {
-	struct zcbor_string _id_cred_x_map_c5u;
+	struct zcbor_string id_cred_x_map_c5u;
 };
 
 struct id_cred_x_map {
-	struct id_cred_x_map_kid_ _id_cred_x_map_kid;
-	bool _id_cred_x_map_kid_present;
-	struct id_cred_x_map_x5bag _id_cred_x_map_x5bag;
-	bool _id_cred_x_map_x5bag_present;
-	struct id_cred_x_map_x5chain _id_cred_x_map_x5chain;
-	bool _id_cred_x_map_x5chain_present;
-	struct id_cred_x_map_x5t_ _id_cred_x_map_x5t;
-	bool _id_cred_x_map_x5t_present;
-	struct id_cred_x_map_x5u _id_cred_x_map_x5u;
-	bool _id_cred_x_map_x5u_present;
-	struct id_cred_x_map_c5b _id_cred_x_map_c5b;
-	bool _id_cred_x_map_c5b_present;
-	struct id_cred_x_map_c5c _id_cred_x_map_c5c;
-	bool _id_cred_x_map_c5c_present;
-	struct id_cred_x_map_c5t_ _id_cred_x_map_c5t;
-	bool _id_cred_x_map_c5t_present;
-	struct id_cred_x_map_c5u _id_cred_x_map_c5u;
-	bool _id_cred_x_map_c5u_present;
+	struct id_cred_x_map_kid_r id_cred_x_map_kid;
+	bool id_cred_x_map_kid_present;
+	struct id_cred_x_map_x5bag id_cred_x_map_x5bag;
+	bool id_cred_x_map_x5bag_present;
+	struct id_cred_x_map_x5chain id_cred_x_map_x5chain;
+	bool id_cred_x_map_x5chain_present;
+	struct id_cred_x_map_x5t_r id_cred_x_map_x5t;
+	bool id_cred_x_map_x5t_present;
+	struct id_cred_x_map_x5u id_cred_x_map_x5u;
+	bool id_cred_x_map_x5u_present;
+	struct id_cred_x_map_c5b id_cred_x_map_c5b;
+	bool id_cred_x_map_c5b_present;
+	struct id_cred_x_map_c5c id_cred_x_map_c5c;
+	bool id_cred_x_map_c5c_present;
+	struct id_cred_x_map_c5t_r id_cred_x_map_c5t;
+	bool id_cred_x_map_c5t_present;
+	struct id_cred_x_map_c5u id_cred_x_map_c5u;
+	bool id_cred_x_map_c5u_present;
 };
 
 #ifdef __cplusplus

diff --git a/inc/cbor/edhoc_decode_int_type.h b/inc/cbor/edhoc_decode_int_type.h
@@ -1,5 +1,5 @@
 /*
- * Generated using zcbor version 0.7.0
+ * Generated using zcbor version 0.8.0
  * https://github.com/NordicSemiconductor/zcbor
  * Generated with a --default-max-qty of 3
  */

diff --git a/inc/cbor/edhoc_decode_int_type_types.h b/inc/cbor/edhoc_decode_int_type_types.h
@@ -1,5 +1,5 @@
 /*
- * Generated using zcbor version 0.7.0
+ * Generated using zcbor version 0.8.0
  * https://github.com/NordicSemiconductor/zcbor
  * Generated with a --default-max-qty of 3
  */

diff --git a/inc/cbor/edhoc_decode_message_1.h b/inc/cbor/edhoc_decode_message_1.h
@@ -1,5 +1,5 @@
 /*
- * Generated using zcbor version 0.7.0
+ * Generated using zcbor version 0.8.0
  * https://github.com/NordicSemiconductor/zcbor
  * Generated with a --default-max-qty of 3
  */

diff --git a/inc/cbor/edhoc_decode_message_1_types.h b/inc/cbor/edhoc_decode_message_1_types.h
@@ -1,5 +1,5 @@
 /*
- * Generated using zcbor version 0.7.0
+ * Generated using zcbor version 0.8.0
  * https://github.com/NordicSemiconductor/zcbor
  * Generated with a --default-max-qty of 3
  */
@@ -26,29 +26,29 @@ extern "C" {
 #define DEFAULT_MAX_QTY 3
 
 struct message_1 {
-	int32_t _message_1_METHOD;
+	int32_t message_1_METHOD;
 	union {
 		struct {
-			int32_t _SUITES_I__suite_suite[10];
-			size_t _SUITES_I__suite_suite_count;
+			int32_t SUITES_I_suite_l_suite[10];
+			size_t SUITES_I_suite_l_suite_count;
 		};
-		int32_t _message_1_SUITES_I_int;
+		int32_t message_1_SUITES_I_int;
 	};
 	enum {
-		_SUITES_I__suite,
-		_message_1_SUITES_I_int,
-	} _message_1_SUITES_I_choice;
-	struct zcbor_string _message_1_G_X;
+		SUITES_I_suite_l_c,
+		message_1_SUITES_I_int_c,
+	} message_1_SUITES_I_choice;
+	struct zcbor_string message_1_G_X;
 	union {
-		int32_t _message_1_C_I_int;
-		struct zcbor_string _message_1_C_I_bstr;
+		int32_t message_1_C_I_int;
+		struct zcbor_string message_1_C_I_bstr;
 	};
 	enum {
-		_message_1_C_I_int,
-		_message_1_C_I_bstr,
-	} _message_1_C_I_choice;
-	struct zcbor_string _message_1_ead_1;
-	bool _message_1_ead_1_present;
+		message_1_C_I_int_c,
+		message_1_C_I_bstr_c,
+	} message_1_C_I_choice;
+	struct zcbor_string message_1_ead_1;
+	bool message_1_ead_1_present;
 };
 
 #ifdef __cplusplus

diff --git a/inc/cbor/edhoc_decode_message_2.h b/inc/cbor/edhoc_decode_message_2.h
@@ -1,5 +1,5 @@
 /*
- * Generated using zcbor version 0.7.0
+ * Generated using zcbor version 0.8.0
  * https://github.com/NordicSemiconductor/zcbor
  * Generated with a --default-max-qty of 3
  */

diff --git a/inc/cbor/edhoc_decode_message_2_types.h b/inc/cbor/edhoc_decode_message_2_types.h
@@ -1,5 +1,5 @@
 /*
- * Generated using zcbor version 0.7.0
+ * Generated using zcbor version 0.8.0
  * https://github.com/NordicSemiconductor/zcbor
  * Generated with a --default-max-qty of 3
  */
@@ -26,15 +26,15 @@ extern "C" {
 #define DEFAULT_MAX_QTY 3
 
 struct m2 {
-	struct zcbor_string _m2_G_Y_CIPHERTEXT_2;
+	struct zcbor_string m2_G_Y_CIPHERTEXT_2;
 	union {
-		int32_t _m2_C_R_int;
-		struct zcbor_string _m2_C_R_bstr;
+		int32_t m2_C_R_int;
+		struct zcbor_string m2_C_R_bstr;
 	};
 	enum {
-		_m2_C_R_int,
-		_m2_C_R_bstr,
-	} _m2_C_R_choice;
+		m2_C_R_int_c,
+		m2_C_R_bstr_c,
+	} m2_C_R_choice;
 };
 
 #ifdef __cplusplus

diff --git a/inc/cbor/edhoc_decode_message_3.h b/inc/cbor/edhoc_decode_message_3.h
@@ -1,5 +1,5 @@
 /*
- * Generated using zcbor version 0.7.0
+ * Generated using zcbor version 0.8.0
  * https://github.com/NordicSemiconductor/zcbor
  * Generated with a --default-max-qty of 3
  */

diff --git a/inc/cbor/edhoc_decode_message_3_types.h b/inc/cbor/edhoc_decode_message_3_types.h
@@ -1,5 +1,5 @@
 /*
- * Generated using zcbor version 0.7.0
+ * Generated using zcbor version 0.8.0
  * https://github.com/NordicSemiconductor/zcbor
  * Generated with a --default-max-qty of 3
  */

diff --git a/inc/cbor/edhoc_decode_plaintext.h b/inc/cbor/edhoc_decode_plaintext.h
@@ -1,5 +1,5 @@
 /*
- * Generated using zcbor version 0.7.0
+ * Generated using zcbor version 0.8.0
  * https://github.com/NordicSemiconductor/zcbor
  * Generated with a --default-max-qty of 3
  */