edhoc 1.0.5 → 1.1.1

package/external/libedhoc/tests/src/{cipher_suite_negotiation/test_edhoc_cipher_suite_negotiation.c → module_test_rfc9528_suites_negotiation.c}

@@ -1,9 +1,9 @@
 /**
- * \file    test_edhoc_cipher_suite_negotiation.c
+ * \file    module_test_rfc9528_suites_negotiation.c
  * \author  Kamil Kielbasa
- * \brief   Test scenarios for cipher suite negotiation.
- * \version 0.4
- * \date    2024-01-01
+ * \brief   Module tests for RFC 9528 suites negotation examples.
+ * \version 0.6
+ * \date    2024-08-05
  * 
  * \copyright Copyright (c) 2024
  * 
@@ -11,20 +11,24 @@
 
 /* Include files ----------------------------------------------------------- */
 
-/* Internal test headers: */
-#include "cipher_suite_negotiation/test_edhoc_cipher_suite_negotiation.h"
-#include "cipher_suites/cipher_suite_2.h"
+/* EDHOC header: */
+#define EDHOC_ALLOW_PRIVATE_ACCESS
+#include <edhoc.h>
+
+/* Cipher suite 2: */
+#include "cipher_suite_2.h"
 
 /* Standard library headers: */
-#include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 #include <string.h>
-#include <assert.h>
 
-/* EDHOC header: */
-#define EDHOC_ALLOW_PRIVATE_ACCESS
-#include "edhoc.h"
+/* PSA crypto header: */
+#include <psa/crypto.h>
+
+/* Unity headers: */
+#include <unity.h>
+#include <unity_fixture.h>
 
 /* Module defines ---------------------------------------------------------- */
 /* Module types and type definitiones -------------------------------------- */
@@ -49,45 +53,39 @@ cipher_suite_2_make_key_pair_init(void *user_ctx, const void *kid,
 				  size_t pub_key_size, size_t *pub_key_len);
 
 static const struct edhoc_keys edhoc_keys = {
-	.generate_key = cipher_suite_2_key_generate,
+	.import_key = cipher_suite_2_key_import,
 	.destroy_key = cipher_suite_2_key_destroy,
 };
 
 static const struct edhoc_crypto edhoc_crypto_mocked_init = {
 	.make_key_pair = cipher_suite_2_make_key_pair_init,
+	.key_agreement = cipher_suite_2_key_agreement,
+	.signature = cipher_suite_2_signature,
+	.verify = cipher_suite_2_verify,
+	.extract = cipher_suite_2_extract,
+	.expand = cipher_suite_2_expand,
+	.encrypt = cipher_suite_2_encrypt,
+	.decrypt = cipher_suite_2_decrypt,
 	.hash = cipher_suite_2_hash,
 };
 
 static const struct edhoc_crypto edhoc_crypto_mocked_resp = {
+	.make_key_pair = cipher_suite_2_make_key_pair,
+	.key_agreement = cipher_suite_2_key_agreement,
+	.signature = cipher_suite_2_signature,
+	.verify = cipher_suite_2_verify,
+	.extract = cipher_suite_2_extract,
+	.expand = cipher_suite_2_expand,
+	.encrypt = cipher_suite_2_encrypt,
+	.decrypt = cipher_suite_2_decrypt,
 	.hash = cipher_suite_2_hash,
 };
 
-/* Static function declarations -------------------------------------------- */
-
-/**
- * \brief Helper function for printing arrays.
- */
-static inline void print_array(const char *name, const uint8_t *buffer,
-			       size_t buffer_length);
+static int ret = EDHOC_ERROR_GENERIC_ERROR;
 
+/* Static function declarations -------------------------------------------- */
 /* Static function definitions --------------------------------------------- */
 
-static inline void print_array(const char *name, const uint8_t *buffer,
-			       size_t buffer_length)
-{
-	printf("%s:\tLEN( %zu )\n", name, buffer_length);
-
-	for (size_t i = 0; i < buffer_length; ++i) {
-		if (0 == i % 16 && i > 0) {
-			printf("\n");
-		}
-
-		printf("%02x ", buffer[i]);
-	}
-
-	printf("\n\n");
-}
-
 static int
 cipher_suite_2_make_key_pair_init(void *user_ctx, const void *kid,
 				  uint8_t *priv_key, size_t priv_key_size,
@@ -112,6 +110,19 @@ cipher_suite_2_make_key_pair_init(void *user_ctx, const void *kid,
 
 /* Module interface function definitions ----------------------------------- */
 
+TEST_GROUP(rfc9528_suites_negotiation);
+
+TEST_SETUP(rfc9528_suites_negotiation)
+{
+	ret = psa_crypto_init();
+	TEST_ASSERT_EQUAL(PSA_SUCCESS, ret);
+}
+
+TEST_TEAR_DOWN(rfc9528_suites_negotiation)
+{
+	mbedtls_psa_crypto_free();
+}
+
 /*
  * Test scenario comes from:
  * - RFC 9528: 6.3.2. Examples
@@ -128,11 +139,9 @@ cipher_suite_2_make_key_pair_init(void *user_ctx, const void *kid,
  * +--------------------------------------------------------->|
  * |                                                          |
  */
-void test_edhoc_cipher_suites_negotiation_scenario_1(void)
+TEST(rfc9528_suites_negotiation, example_1)
 {
-	int ret = EDHOC_ERROR_GENERIC_ERROR;
-
-	const enum edhoc_method method = EDHOC_METHOD_1;
+	const enum edhoc_method methods[] = { EDHOC_METHOD_1 };
 	const struct edhoc_cipher_suite csuites_init[] = {
 		[0].value = 5,
 		[0].ecc_key_length = 32,
@@ -148,83 +157,80 @@ void test_edhoc_cipher_suites_negotiation_scenario_1(void)
 		.int_value = 1,
 	};
 
-	/**
-         * \brief 1. Setup initiator context.
-         */
+	/* 1. Setup initiator context. */
 	struct edhoc_context init_ctx = { 0 };
 
 	ret = edhoc_context_init(&init_ctx);
-	assert(EDHOC_SUCCESS == ret);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	ret = edhoc_set_method(&init_ctx, method);
-	assert(EDHOC_SUCCESS == ret);
+	ret = edhoc_set_methods(&init_ctx, methods, ARRAY_SIZE(methods));
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
 	ret = edhoc_set_cipher_suites(&init_ctx, csuites_init,
 				      ARRAY_SIZE(csuites_init));
-	assert(EDHOC_SUCCESS == ret);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	ret = edhoc_set_connection_id(&init_ctx, conn_id_init);
-	assert(EDHOC_SUCCESS == ret);
+	ret = edhoc_set_connection_id(&init_ctx, &conn_id_init);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	ret = edhoc_bind_keys(&init_ctx, edhoc_keys);
-	assert(EDHOC_SUCCESS == ret);
+	ret = edhoc_bind_keys(&init_ctx, &edhoc_keys);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	ret = edhoc_bind_crypto(&init_ctx, edhoc_crypto_mocked_init);
-	assert(EDHOC_SUCCESS == ret);
+	ret = edhoc_bind_crypto(&init_ctx, &edhoc_crypto_mocked_init);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	/**
-         * \brief 2. Setup responder context.
-         */
+	/* 2. Setup responder context. */
 	struct edhoc_context resp_ctx = { 0 };
 
 	ret = edhoc_context_init(&resp_ctx);
-	assert(EDHOC_SUCCESS == ret);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	ret = edhoc_set_method(&resp_ctx, method);
-	assert(EDHOC_SUCCESS == ret);
+	ret = edhoc_set_methods(&resp_ctx, methods, ARRAY_SIZE(methods));
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
 	ret = edhoc_set_cipher_suites(&resp_ctx, csuites_resp,
 				      ARRAY_SIZE(csuites_resp));
-	assert(EDHOC_SUCCESS == ret);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	/**
-         * \brief 3. Initiator compose message 1.
-         */
+	/* 3. Initiator compose message 1. */
 	size_t msg_1_len = 0;
 	uint8_t msg_1[100] = { 0 };
 
 	ret = edhoc_message_1_compose(&init_ctx, msg_1, ARRAY_SIZE(msg_1),
 				      &msg_1_len);
-	assert(EDHOC_SUCCESS == ret);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	/**
-         * \brief 4a. Responder process message 1.
-         */
+	/* 4a. Responder process message 1. */
 	ret = edhoc_message_1_process(&resp_ctx, msg_1, msg_1_len);
-	assert(EDHOC_ERROR_MSG_1_PROCESS_FAILURE == ret);
+	TEST_ASSERT_EQUAL(EDHOC_ERROR_MSG_1_PROCESS_FAILURE, ret);
 
-	/**
-         * \brief 4b. Responder checks EDHOC error code.
-         */
+	/* 4b. Responder checks EDHOC error code. */
 	enum edhoc_error_code error_code_resp = -1;
 	ret = edhoc_error_get_code(&resp_ctx, &error_code_resp);
-	assert(EDHOC_SUCCESS == ret);
-	assert(EDHOC_ERROR_CODE_WRONG_SELECTED_CIPHER_SUITE == error_code_resp);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
+	TEST_ASSERT_EQUAL(EDHOC_ERROR_CODE_WRONG_SELECTED_CIPHER_SUITE,
+			  error_code_resp);
 
-	/**
-         * \brief 4c. Responder collect his EDHOC cipher suites.
-         */
+	/* 4c. Responder collect his own and peer EDHOC cipher suites. */
 	size_t csuites_len = 0;
 	int32_t csuites[1] = { 0 };
-	ret = edhoc_error_get_cipher_suites(&resp_ctx, csuites,
-					    ARRAY_SIZE(csuites), &csuites_len);
-	assert(EDHOC_SUCCESS == ret);
-	assert(ARRAY_SIZE(csuites_resp) == csuites_len);
-	assert(csuites_resp[0].value == csuites[0]);
-
-	/**
-         * \brief 4d. Responder compose error message.
-         */
+	size_t peer_csuites_len = 0;
+	int32_t peer_csuites[1] = { 0 };
+	ret = edhoc_error_get_cipher_suites(
+		&resp_ctx, csuites, ARRAY_SIZE(csuites), &csuites_len,
+		peer_csuites, ARRAY_SIZE(peer_csuites), &peer_csuites_len);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
+	TEST_ASSERT_EQUAL(ARRAY_SIZE(csuites_resp), csuites_len);
+	TEST_ASSERT_EQUAL(csuites_resp[0].value, csuites[0]);
+	TEST_ASSERT_EQUAL(ARRAY_SIZE(csuites_init), peer_csuites_len);
+	TEST_ASSERT_EQUAL(csuites_init[0].value, peer_csuites[0]);
+
+	/*
+	 * Point where responder can compare his and peer cipher suites.
+	 * After comparison responder is able to send error message with his preferences.
+	 */
+
+	/* 4d. Responder compose error message. */
 	size_t msg_err_len = 0;
 	uint8_t msg_err[100] = { 0 };
 
@@ -236,11 +242,9 @@ void test_edhoc_cipher_suites_negotiation_scenario_1(void)
 	ret = edhoc_message_error_compose(msg_err, ARRAY_SIZE(msg_err),
 					  &msg_err_len, error_code_resp,
 					  &error_info);
-	assert(EDHOC_SUCCESS == ret);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	/**
-         * \brief 5a. Initiator process error message.
-         */
+	/* 5a. Initiator process error message. */
 	enum edhoc_error_code error_code_init = -1;
 	int32_t cipher_suites_init[1] = { 0 };
 	struct edhoc_error_info error_info_init = {
@@ -250,19 +254,20 @@ void test_edhoc_cipher_suites_negotiation_scenario_1(void)
 	};
 	ret = edhoc_message_error_process(msg_err, msg_err_len,
 					  &error_code_init, &error_info_init);
-	assert(EDHOC_SUCCESS == ret);
-	assert(EDHOC_ERROR_CODE_WRONG_SELECTED_CIPHER_SUITE == error_code_init);
-	assert(ARRAY_SIZE(csuites_resp) == error_info_init.written_entries);
-	assert(csuites_resp[0].value == error_info_init.cipher_suites[0]);
-
-	/**
-         * \brief 5b. Initiator reinitialize context with new cipher suites.
-         */
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
+	TEST_ASSERT_EQUAL(EDHOC_ERROR_CODE_WRONG_SELECTED_CIPHER_SUITE,
+			  error_code_init);
+	TEST_ASSERT_EQUAL(ARRAY_SIZE(csuites_resp),
+			  error_info_init.written_entries);
+	TEST_ASSERT_EQUAL(csuites_resp[0].value,
+			  error_info_init.cipher_suites[0]);
+
+	/* 5b. Initiator reinitialize context with new cipher suites. */
 	ret = edhoc_context_init(&init_ctx);
-	assert(EDHOC_SUCCESS == ret);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	ret = edhoc_set_method(&init_ctx, method);
-	assert(EDHOC_SUCCESS == ret);
+	ret = edhoc_set_methods(&init_ctx, methods, ARRAY_SIZE(methods));
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
 	const struct edhoc_cipher_suite fixed_csuites_init[] = {
 		[0].value = 5, [0].ecc_key_length = 32, [0].hash_length = 32,
@@ -270,56 +275,50 @@ void test_edhoc_cipher_suites_negotiation_scenario_1(void)
 	};
 	ret = edhoc_set_cipher_suites(&init_ctx, fixed_csuites_init,
 				      ARRAY_SIZE(fixed_csuites_init));
-	assert(EDHOC_SUCCESS == ret);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	ret = edhoc_set_connection_id(&init_ctx, conn_id_init);
-	assert(EDHOC_SUCCESS == ret);
+	ret = edhoc_set_connection_id(&init_ctx, &conn_id_init);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	ret = edhoc_bind_keys(&init_ctx, edhoc_keys);
-	assert(EDHOC_SUCCESS == ret);
+	ret = edhoc_bind_keys(&init_ctx, &edhoc_keys);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	ret = edhoc_bind_crypto(&init_ctx, edhoc_crypto_mocked_init);
-	assert(EDHOC_SUCCESS == ret);
+	ret = edhoc_bind_crypto(&init_ctx, &edhoc_crypto_mocked_init);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	/**
-         * \brief 5c. Initiator again compose message 1.
-         */
+	/* 5c. Initiator again compose message 1. */
 	msg_1_len = 0;
 	memset(msg_1, 0, sizeof(msg_1));
 
 	ret = edhoc_message_1_compose(&init_ctx, msg_1, ARRAY_SIZE(msg_1),
 				      &msg_1_len);
-	assert(EDHOC_SUCCESS == ret);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	/**
-         * \brief 6. Responder reinitialize context.
-         */
+	/* 6. Responder reinitialize context. */
 	ret = edhoc_context_init(&resp_ctx);
-	assert(EDHOC_SUCCESS == ret);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	ret = edhoc_set_method(&resp_ctx, method);
-	assert(EDHOC_SUCCESS == ret);
+	ret = edhoc_set_methods(&resp_ctx, methods, ARRAY_SIZE(methods));
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
 	ret = edhoc_set_cipher_suites(&resp_ctx, csuites_resp,
 				      ARRAY_SIZE(csuites_resp));
-	assert(EDHOC_SUCCESS == ret);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	ret = edhoc_bind_keys(&resp_ctx, edhoc_keys);
-	assert(EDHOC_SUCCESS == ret);
+	ret = edhoc_bind_keys(&resp_ctx, &edhoc_keys);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	ret = edhoc_bind_crypto(&resp_ctx, edhoc_crypto_mocked_resp);
-	assert(EDHOC_SUCCESS == ret);
+	ret = edhoc_bind_crypto(&resp_ctx, &edhoc_crypto_mocked_resp);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	/**
-         * \brief 7. Responder successfully process message 1.
-         */
+	/* 7. Responder successfully process message 1. */
 	ret = edhoc_message_1_process(&resp_ctx, msg_1, msg_1_len);
-	assert(EDHOC_SUCCESS == ret);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
 	error_code_resp = -1;
 	ret = edhoc_error_get_code(&resp_ctx, &error_code_resp);
-	assert(EDHOC_SUCCESS == ret);
-	assert(EDHOC_ERROR_CODE_SUCCESS == error_code_resp);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
+	TEST_ASSERT_EQUAL(EDHOC_ERROR_CODE_SUCCESS, error_code_resp);
 }
 
 /*
@@ -338,11 +337,9 @@ void test_edhoc_cipher_suites_negotiation_scenario_1(void)
  * +--------------------------------------------------------->|
  * |                                                          |
  */
-void test_edhoc_cipher_suites_negotiation_scenario_2(void)
+TEST(rfc9528_suites_negotiation, example_2)
 {
-	int ret = EDHOC_ERROR_GENERIC_ERROR;
-
-	const enum edhoc_method method = EDHOC_METHOD_1;
+	const enum edhoc_method methods[] = { EDHOC_METHOD_1 };
 	const struct edhoc_cipher_suite csuites_init[] = {
 		[0].value = 5, [0].ecc_key_length = 32, [0].hash_length = 32,
 		[1].value = 6, [1].ecc_key_length = 32, [1].hash_length = 32,
@@ -356,84 +353,82 @@ void test_edhoc_cipher_suites_negotiation_scenario_2(void)
 		.int_value = 1,
 	};
 
-	/**
-         * \brief 1. Setup initiator context.
-         */
+	/* 1. Setup initiator context. */
 	struct edhoc_context init_ctx = { 0 };
 
 	ret = edhoc_context_init(&init_ctx);
-	assert(EDHOC_SUCCESS == ret);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	ret = edhoc_set_method(&init_ctx, method);
-	assert(EDHOC_SUCCESS == ret);
+	ret = edhoc_set_methods(&init_ctx, methods, ARRAY_SIZE(methods));
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
 	ret = edhoc_set_cipher_suites(&init_ctx, csuites_init,
 				      ARRAY_SIZE(csuites_init));
-	assert(EDHOC_SUCCESS == ret);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	ret = edhoc_set_connection_id(&init_ctx, conn_id_init);
-	assert(EDHOC_SUCCESS == ret);
+	ret = edhoc_set_connection_id(&init_ctx, &conn_id_init);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	ret = edhoc_bind_keys(&init_ctx, edhoc_keys);
-	assert(EDHOC_SUCCESS == ret);
+	ret = edhoc_bind_keys(&init_ctx, &edhoc_keys);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	ret = edhoc_bind_crypto(&init_ctx, edhoc_crypto_mocked_init);
-	assert(EDHOC_SUCCESS == ret);
+	ret = edhoc_bind_crypto(&init_ctx, &edhoc_crypto_mocked_init);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	/**
-         * \brief 2. Setup responder context.
-         */
+	/* 2. Setup responder context. */
 	struct edhoc_context resp_ctx = { 0 };
 
 	ret = edhoc_context_init(&resp_ctx);
-	assert(EDHOC_SUCCESS == ret);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	ret = edhoc_set_method(&resp_ctx, method);
-	assert(EDHOC_SUCCESS == ret);
+	ret = edhoc_set_methods(&resp_ctx, methods, ARRAY_SIZE(methods));
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
 	ret = edhoc_set_cipher_suites(&resp_ctx, csuites_resp,
 				      ARRAY_SIZE(csuites_resp));
-	assert(EDHOC_SUCCESS == ret);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	/**
-         * \brief 3. Initiator compose message 1.
-         */
+	/* 3. Initiator compose message 1. */
 	size_t msg_1_len = 0;
 	uint8_t msg_1[100] = { 0 };
 
 	ret = edhoc_message_1_compose(&init_ctx, msg_1, ARRAY_SIZE(msg_1),
 				      &msg_1_len);
-	assert(EDHOC_SUCCESS == ret);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	/**
-         * \brief 4a. Responder process message 1.
-         */
+	/* 4a. Responder process message 1. */
 	ret = edhoc_message_1_process(&resp_ctx, msg_1, msg_1_len);
-	assert(EDHOC_ERROR_MSG_1_PROCESS_FAILURE == ret);
+	TEST_ASSERT_EQUAL(EDHOC_ERROR_MSG_1_PROCESS_FAILURE, ret);
 
-	/**
-         * \brief 4b. Responder checks EDHOC error code.
-         */
+	/* 4b. Responder checks EDHOC error code. */
 	enum edhoc_error_code error_code_resp = -1;
 	ret = edhoc_error_get_code(&resp_ctx, &error_code_resp);
-	assert(EDHOC_SUCCESS == ret);
-	assert(EDHOC_ERROR_CODE_WRONG_SELECTED_CIPHER_SUITE == error_code_resp);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
+	TEST_ASSERT_EQUAL(EDHOC_ERROR_CODE_WRONG_SELECTED_CIPHER_SUITE,
+			  error_code_resp);
 
-	/**
-         * \brief 4c. Responder collect his EDHOC cipher suites.
-         */
+	/* 4c. Responder collect his own and peer EDHOC cipher suites. */
 	size_t csuites_len = 0;
 	int32_t csuites[2] = { 0 };
-	ret = edhoc_error_get_cipher_suites(&resp_ctx, csuites,
-					    ARRAY_SIZE(csuites), &csuites_len);
-	assert(EDHOC_SUCCESS == ret);
-	assert(ARRAY_SIZE(csuites_resp) == csuites_len);
-	assert(csuites_resp[0].value == csuites[0]);
-	assert(csuites_resp[1].value == csuites[1]);
-
-	/**
-         * \brief 4d. Responder compose error message.
-         */
+	size_t peer_csuites_len = 0;
+	int32_t peer_csuites[2] = { 0 };
+	ret = edhoc_error_get_cipher_suites(
+		&resp_ctx, csuites, ARRAY_SIZE(csuites), &csuites_len,
+		peer_csuites, ARRAY_SIZE(peer_csuites), &peer_csuites_len);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
+	TEST_ASSERT_EQUAL(ARRAY_SIZE(csuites_resp), csuites_len);
+	TEST_ASSERT_EQUAL(csuites_resp[0].value, csuites[0]);
+	TEST_ASSERT_EQUAL(csuites_resp[1].value, csuites[1]);
+	TEST_ASSERT_EQUAL(ARRAY_SIZE(csuites_init), peer_csuites_len);
+	TEST_ASSERT_EQUAL(csuites_init[0].value, peer_csuites[0]);
+	TEST_ASSERT_EQUAL(csuites_init[1].value, peer_csuites[1]);
+
+	/*
+	 * Point where responder can compare his and peer cipher suites.
+	 * After comparison responder is able to send error message with his preferences.
+	 */
+
+	/* 4d. Responder compose error message. */
 	size_t msg_err_len = 0;
 	uint8_t msg_err[100] = { 0 };
 
@@ -442,14 +437,13 @@ void test_edhoc_cipher_suites_negotiation_scenario_2(void)
 		.total_entries = ARRAY_SIZE(csuites),
 		.written_entries = csuites_len,
 	};
+
 	ret = edhoc_message_error_compose(msg_err, ARRAY_SIZE(msg_err),
 					  &msg_err_len, error_code_resp,
 					  &error_info);
-	assert(EDHOC_SUCCESS == ret);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	/**
-         * \brief 5a. Initiator process error message.
-         */
+	/* 5a. Initiator process error message. */
 	enum edhoc_error_code error_code_init = -1;
 	int32_t cipher_suites_init[2] = { 0 };
 	struct edhoc_error_info error_info_init = {
@@ -457,30 +451,33 @@ void test_edhoc_cipher_suites_negotiation_scenario_2(void)
 		.total_entries = ARRAY_SIZE(cipher_suites_init),
 		.written_entries = 0,
 	};
+
 	ret = edhoc_message_error_process(msg_err, msg_err_len,
 					  &error_code_init, &error_info_init);
-	assert(EDHOC_SUCCESS == ret);
-	assert(EDHOC_ERROR_CODE_WRONG_SELECTED_CIPHER_SUITE == error_code_init);
-	assert(ARRAY_SIZE(csuites_resp) == error_info_init.written_entries);
-	assert(csuites_resp[0].value == error_info_init.cipher_suites[0]);
-	assert(csuites_resp[1].value == error_info_init.cipher_suites[1]);
-
-	/**
-         * \brief 5b. Initiator reinitialize context with new cipher suites.
-         */
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
+	TEST_ASSERT_EQUAL(EDHOC_ERROR_CODE_WRONG_SELECTED_CIPHER_SUITE,
+			  error_code_init);
+	TEST_ASSERT_EQUAL(ARRAY_SIZE(csuites_resp),
+			  error_info_init.written_entries);
+	TEST_ASSERT_EQUAL(csuites_resp[0].value,
+			  error_info_init.cipher_suites[0]);
+	TEST_ASSERT_EQUAL(csuites_resp[1].value,
+			  error_info_init.cipher_suites[1]);
+
+	/* 5b. Initiator reinitialize context with new cipher suites. */
 	ret = edhoc_context_init(&init_ctx);
-	assert(EDHOC_SUCCESS == ret);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	ret = edhoc_set_method(&init_ctx, method);
-	assert(EDHOC_SUCCESS == ret);
+	ret = edhoc_set_methods(&init_ctx, methods, ARRAY_SIZE(methods));
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	/**
-         * \note Because zcbor add arrays sizes statically it means that with
-         *       current generated sourcer and header files we support up to 3.
+	/*
+         * Because zcbor add arrays sizes statically it means that with
+         * current generated sourcer and header files we support up to 3.
          *
-         *       #define DEFAULT_MAX_QTY 3
+         * #define DEFAULT_MAX_QTY 3
          *
-         *       To avoid regeneration to all files, cipher suite 5 is missed.
+         * To avoid regeneration to all files, cipher suite 5 is missed.
          */
 	const struct edhoc_cipher_suite fixed_csuites_init[] = {
 		/* [0].value = 5, [0].ecc_key_length = 32, [0].hash_length = 32, */
@@ -491,54 +488,54 @@ void test_edhoc_cipher_suites_negotiation_scenario_2(void)
 	};
 	ret = edhoc_set_cipher_suites(&init_ctx, fixed_csuites_init,
 				      ARRAY_SIZE(fixed_csuites_init));
-	assert(EDHOC_SUCCESS == ret);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	ret = edhoc_set_connection_id(&init_ctx, conn_id_init);
-	assert(EDHOC_SUCCESS == ret);
+	ret = edhoc_set_connection_id(&init_ctx, &conn_id_init);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	ret = edhoc_bind_keys(&init_ctx, edhoc_keys);
-	assert(EDHOC_SUCCESS == ret);
+	ret = edhoc_bind_keys(&init_ctx, &edhoc_keys);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	ret = edhoc_bind_crypto(&init_ctx, edhoc_crypto_mocked_init);
-	assert(EDHOC_SUCCESS == ret);
+	ret = edhoc_bind_crypto(&init_ctx, &edhoc_crypto_mocked_init);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	/**
-         * \brief 5c. Initiator again compose message 1.
-         */
+	/* 5c. Initiator again compose message 1. */
 	msg_1_len = 0;
 	memset(msg_1, 0, sizeof(msg_1));
 
 	ret = edhoc_message_1_compose(&init_ctx, msg_1, ARRAY_SIZE(msg_1),
 				      &msg_1_len);
-	assert(EDHOC_SUCCESS == ret);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	/**
-         * \brief 6. Responder reinitialize context.
-         */
+	/* 6. Responder reinitialize context. */
 	ret = edhoc_context_init(&resp_ctx);
-	assert(EDHOC_SUCCESS == ret);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	ret = edhoc_set_method(&resp_ctx, method);
-	assert(EDHOC_SUCCESS == ret);
+	ret = edhoc_set_methods(&resp_ctx, methods, ARRAY_SIZE(methods));
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
 	ret = edhoc_set_cipher_suites(&resp_ctx, csuites_resp,
 				      ARRAY_SIZE(csuites_resp));
-	assert(EDHOC_SUCCESS == ret);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	ret = edhoc_bind_keys(&resp_ctx, edhoc_keys);
-	assert(EDHOC_SUCCESS == ret);
+	ret = edhoc_bind_keys(&resp_ctx, &edhoc_keys);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	ret = edhoc_bind_crypto(&resp_ctx, edhoc_crypto_mocked_resp);
-	assert(EDHOC_SUCCESS == ret);
+	ret = edhoc_bind_crypto(&resp_ctx, &edhoc_crypto_mocked_resp);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
-	/**
-         * \brief 7. Responder successfully process message 1.
-         */
+	/* 7. Responder successfully process message 1. */
 	ret = edhoc_message_1_process(&resp_ctx, msg_1, msg_1_len);
-	assert(EDHOC_SUCCESS == ret);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
 
 	error_code_resp = -1;
 	ret = edhoc_error_get_code(&resp_ctx, &error_code_resp);
-	assert(EDHOC_SUCCESS == ret);
-	assert(EDHOC_ERROR_CODE_SUCCESS == error_code_resp);
+	TEST_ASSERT_EQUAL(EDHOC_SUCCESS, ret);
+	TEST_ASSERT_EQUAL(EDHOC_ERROR_CODE_SUCCESS, error_code_resp);
+}
+
+TEST_GROUP_RUNNER(rfc9528_suites_negotiation)
+{
+	RUN_TEST_CASE(rfc9528_suites_negotiation, example_1);
+	RUN_TEST_CASE(rfc9528_suites_negotiation, example_2);
 }