From 0004fe7e969b0cf1964778ff016ca8e178a5ed47 Mon Sep 17 00:00:00 2001 From: Minos Galanakis Date: Tue, 10 Mar 2026 15:51:01 +0000 Subject: [PATCH] test_suite_ccm: Updated input arguments Key and iv are now test function internal arguments. Signed-off-by: Minos Galanakis --- tests/suites/test_suite_ccm.data | 28 ++++++++++++++-------------- tests/suites/test_suite_ccm.function | 13 +++++++++---- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/tests/suites/test_suite_ccm.data b/tests/suites/test_suite_ccm.data index f3dfe0f41f..e03406ca4b 100644 --- a/tests/suites/test_suite_ccm.data +++ b/tests/suites/test_suite_ccm.data @@ -1748,61 +1748,61 @@ mbedtls_ccm_instant_finish:MBEDTLS_CIPHER_ID_AES:MBEDTLS_CCM_STAR_DECRYPT:"54caf CCM finish check-boundary encrypt tag_len=8, finish_tag_len=32 depends_on:MBEDTLS_CCM_GCM_CAN_AES -mbedtls_ccm_finish_boundary:MBEDTLS_CIPHER_ID_AES:MBEDTLS_CCM_ENCRYPT:8:32:MBEDTLS_ERR_CCM_BAD_INPUT:"54caf96ef6d448734700aadab50faf7a":"a3803e752ae849c910d8da36af" +mbedtls_ccm_finish_boundary:MBEDTLS_CIPHER_ID_AES:MBEDTLS_CCM_ENCRYPT:8:32:MBEDTLS_ERR_CCM_BAD_INPUT CCM finish check-boundary encrypt tag_len=8, finish_tag_len=8 depends_on:MBEDTLS_CCM_GCM_CAN_AES -mbedtls_ccm_finish_boundary:MBEDTLS_CIPHER_ID_AES:MBEDTLS_CCM_ENCRYPT:8:8:0:"54caf96ef6d448734700aadab50faf7a":"a3803e752ae849c910d8da36af" +mbedtls_ccm_finish_boundary:MBEDTLS_CIPHER_ID_AES:MBEDTLS_CCM_ENCRYPT:8:8:0 CCM finish check-boundary decrypt tag_len=8, finish_tag_len=32 depends_on:MBEDTLS_CCM_GCM_CAN_AES -mbedtls_ccm_finish_boundary:MBEDTLS_CIPHER_ID_AES:MBEDTLS_CCM_DECRYPT:8:32:MBEDTLS_ERR_CCM_BAD_INPUT:"54caf96ef6d448734700aadab50faf7a":"a3803e752ae849c910d8da36af" +mbedtls_ccm_finish_boundary:MBEDTLS_CIPHER_ID_AES:MBEDTLS_CCM_DECRYPT:8:32:MBEDTLS_ERR_CCM_BAD_INPUT CCM finish check-boundary decrypt tag_len=8, finish_tag_len=8 depends_on:MBEDTLS_CCM_GCM_CAN_AES -mbedtls_ccm_finish_boundary:MBEDTLS_CIPHER_ID_AES:MBEDTLS_CCM_DECRYPT:8:8:0:"54caf96ef6d448734700aadab50faf7a":"a3803e752ae849c910d8da36af" +mbedtls_ccm_finish_boundary:MBEDTLS_CIPHER_ID_AES:MBEDTLS_CCM_DECRYPT:8:8:0 # CCM finish boundary matrix (encrypt) CCM finish check-boundary encrypt tag_len=16, finish_tag_len=16 depends_on:MBEDTLS_CCM_GCM_CAN_AES -mbedtls_ccm_finish_boundary:MBEDTLS_CIPHER_ID_AES:MBEDTLS_CCM_ENCRYPT:16:16:0:"54caf96ef6d448734700aadab50faf7a":"a3803e752ae849c910d8da36af" +mbedtls_ccm_finish_boundary:MBEDTLS_CIPHER_ID_AES:MBEDTLS_CCM_ENCRYPT:16:16:0 CCM finish check-boundary encrypt tag_len=8, finish_tag_len=16 depends_on:MBEDTLS_CCM_GCM_CAN_AES -mbedtls_ccm_finish_boundary:MBEDTLS_CIPHER_ID_AES:MBEDTLS_CCM_ENCRYPT:8:16:MBEDTLS_ERR_CCM_BAD_INPUT:"54caf96ef6d448734700aadab50faf7a":"a3803e752ae849c910d8da36af" +mbedtls_ccm_finish_boundary:MBEDTLS_CIPHER_ID_AES:MBEDTLS_CCM_ENCRYPT:8:16:MBEDTLS_ERR_CCM_BAD_INPUT CCM finish check-boundary encrypt tag_len=16, finish_tag_len=17 depends_on:MBEDTLS_CCM_GCM_CAN_AES -mbedtls_ccm_finish_boundary:MBEDTLS_CIPHER_ID_AES:MBEDTLS_CCM_ENCRYPT:16:17:MBEDTLS_ERR_CCM_BAD_INPUT:"54caf96ef6d448734700aadab50faf7a":"a3803e752ae849c910d8da36af" +mbedtls_ccm_finish_boundary:MBEDTLS_CIPHER_ID_AES:MBEDTLS_CCM_ENCRYPT:16:17:MBEDTLS_ERR_CCM_BAD_INPUT CCM finish check-boundary encrypt tag_len=16, finish_tag_len=4000 depends_on:MBEDTLS_CCM_GCM_CAN_AES -mbedtls_ccm_finish_boundary:MBEDTLS_CIPHER_ID_AES:MBEDTLS_CCM_ENCRYPT:16:4000:MBEDTLS_ERR_CCM_BAD_INPUT:"54caf96ef6d448734700aadab50faf7a":"a3803e752ae849c910d8da36af" +mbedtls_ccm_finish_boundary:MBEDTLS_CIPHER_ID_AES:MBEDTLS_CCM_ENCRYPT:16:4000:MBEDTLS_ERR_CCM_BAD_INPUT CCM finish check-boundary encrypt tag_len=16, finish_tag_len=8 depends_on:MBEDTLS_CCM_GCM_CAN_AES -mbedtls_ccm_finish_boundary:MBEDTLS_CIPHER_ID_AES:MBEDTLS_CCM_ENCRYPT:16:8:MBEDTLS_ERR_CCM_BAD_INPUT:"54caf96ef6d448734700aadab50faf7a":"a3803e752ae849c910d8da36af" +mbedtls_ccm_finish_boundary:MBEDTLS_CIPHER_ID_AES:MBEDTLS_CCM_ENCRYPT:16:8:MBEDTLS_ERR_CCM_BAD_INPUT # CCM finish boundary matrix (decrypt) CCM finish check-boundary decrypt tag_len=16, finish_tag_len=16 depends_on:MBEDTLS_CCM_GCM_CAN_AES -mbedtls_ccm_finish_boundary:MBEDTLS_CIPHER_ID_AES:MBEDTLS_CCM_DECRYPT:16:16:0:"54caf96ef6d448734700aadab50faf7a":"a3803e752ae849c910d8da36af" +mbedtls_ccm_finish_boundary:MBEDTLS_CIPHER_ID_AES:MBEDTLS_CCM_DECRYPT:16:16:0 CCM finish check-boundary decrypt tag_len=8, finish_tag_len=16 depends_on:MBEDTLS_CCM_GCM_CAN_AES -mbedtls_ccm_finish_boundary:MBEDTLS_CIPHER_ID_AES:MBEDTLS_CCM_DECRYPT:8:16:MBEDTLS_ERR_CCM_BAD_INPUT:"54caf96ef6d448734700aadab50faf7a":"a3803e752ae849c910d8da36af" +mbedtls_ccm_finish_boundary:MBEDTLS_CIPHER_ID_AES:MBEDTLS_CCM_DECRYPT:8:16:MBEDTLS_ERR_CCM_BAD_INPUT CCM finish check-boundary decrypt tag_len=16, finish_tag_len=17 depends_on:MBEDTLS_CCM_GCM_CAN_AES -mbedtls_ccm_finish_boundary:MBEDTLS_CIPHER_ID_AES:MBEDTLS_CCM_DECRYPT:16:17:MBEDTLS_ERR_CCM_BAD_INPUT:"54caf96ef6d448734700aadab50faf7a":"a3803e752ae849c910d8da36af" +mbedtls_ccm_finish_boundary:MBEDTLS_CIPHER_ID_AES:MBEDTLS_CCM_DECRYPT:16:17:MBEDTLS_ERR_CCM_BAD_INPUT CCM finish check-boundary decrypt tag_len=16, finish_tag_len=4000 depends_on:MBEDTLS_CCM_GCM_CAN_AES -mbedtls_ccm_finish_boundary:MBEDTLS_CIPHER_ID_AES:MBEDTLS_CCM_DECRYPT:16:4000:MBEDTLS_ERR_CCM_BAD_INPUT:"54caf96ef6d448734700aadab50faf7a":"a3803e752ae849c910d8da36af" +mbedtls_ccm_finish_boundary:MBEDTLS_CIPHER_ID_AES:MBEDTLS_CCM_DECRYPT:16:4000:MBEDTLS_ERR_CCM_BAD_INPUT CCM finish check-boundary decrypt tag_len=16, finish_tag_len=8 depends_on:MBEDTLS_CCM_GCM_CAN_AES -mbedtls_ccm_finish_boundary:MBEDTLS_CIPHER_ID_AES:MBEDTLS_CCM_DECRYPT:16:8:MBEDTLS_ERR_CCM_BAD_INPUT:"54caf96ef6d448734700aadab50faf7a":"a3803e752ae849c910d8da36af" +mbedtls_ccm_finish_boundary:MBEDTLS_CIPHER_ID_AES:MBEDTLS_CCM_DECRYPT:16:8:MBEDTLS_ERR_CCM_BAD_INPUT CCM pass unexpected auth data, NIST VPT AES-128 #14 (P=13, N=13, A=32, T=16) depends_on:MBEDTLS_CCM_GCM_CAN_AES diff --git a/tests/suites/test_suite_ccm.function b/tests/suites/test_suite_ccm.function index 5bd2c34493..251eb350d4 100644 --- a/tests/suites/test_suite_ccm.function +++ b/tests/suites/test_suite_ccm.function @@ -910,17 +910,22 @@ exit: /* BEGIN_CASE */ void mbedtls_ccm_finish_boundary(int cipher_id, int mode, int start_tag_len, int finish_tag_len, - int expected_finish_ret, - data_t *key, data_t *iv) + int expected_finish_ret) { + unsigned char key[16]; + unsigned char iv[13]; + /* Test does not rely on data/iv.Using Arbitrary values */ + memset(key, 42, sizeof(key)); + memset(iv, 11, sizeof(iv)); + mbedtls_ccm_context ctx; unsigned char *tag = NULL; mbedtls_ccm_init(&ctx); BLOCK_CIPHER_PSA_INIT(); - TEST_EQUAL(mbedtls_ccm_setkey(&ctx, cipher_id, key->x, key->len * 8), 0); - TEST_EQUAL(0, mbedtls_ccm_starts(&ctx, mode, iv->x, iv->len)); + TEST_EQUAL(mbedtls_ccm_setkey(&ctx, cipher_id, key, sizeof(key) * 8), 0); + TEST_EQUAL(0, mbedtls_ccm_starts(&ctx, mode, iv, sizeof(iv))); /* Use the caller-provided tag length during setup, then finish with a * different tag length to exercise boundary handling/API compliance */