Skip to content

Block cipher test after psa init 3.6 #10410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: mbedtls-3.6
Choose a base branch
from
+527 −262
Open

Block cipher test after psa init 3.6 #10410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96f0bba
Rename block_cipher
gilles-peskine-arm Sep 22, 2025
53f598b
Recategorize block_cipher tests
gilles-peskine-arm Sep 22, 2025
fe681e5
block_cipher: test both with and without PSA initialization
gilles-peskine-arm Sep 22, 2025
2d4d3ba
Expect a different error from setkey when going via PSA
gilles-peskine-arm Sep 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
255 changes: 0 additions & 255 deletions tests/suites/test_suite_block_cipher.data
View file
Open in desktop

This file was deleted.

0 ...s/suites/test_suite_block_cipher.psa.data → ...tes/test_suite_block_cipher.dispatch.data
View file
Open in desktop
File renamed without changes.
24 changes: 17 additions & 7 deletions tests/suites/test_suite_block_cipher.function
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,18 @@
*/

/* BEGIN_CASE depends_on:VALID_CIPHER_ID */
void invalid()
void invalid(int do_psa_init)
{
/* That size is valid for a key or an input/output block. */
unsigned char buf[16] = { 0 };

mbedtls_block_cipher_context_t ctx;

mbedtls_block_cipher_init(&ctx);

if (do_psa_init) {
PSA_INIT();
}

/* Bad parameters to setup */
TEST_EQUAL(MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA,
mbedtls_block_cipher_setup(&ctx, MBEDTLS_CIPHER_ID_NONE));
Expand All @@ -55,25 +58,31 @@ void invalid()
TEST_EQUAL(0, mbedtls_block_cipher_setup(&ctx, VALID_CIPHER_ID));

/* Bad parameters to setkey() */
TEST_EQUAL(BADKEY_ERROR,
int badkey_error = (do_psa_init ? MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA :
BADKEY_ERROR);
TEST_EQUAL(badkey_error,
mbedtls_block_cipher_setkey(&ctx, buf, 42));

exit:
mbedtls_block_cipher_free(&ctx);
PSA_DONE();
}
/* END_CASE */

/* BEGIN_CASE */
void test_vec(int cipher_id_arg, data_t *key, data_t *input, data_t *outref)
void test_vec(int do_psa_init,
int cipher_id_arg, data_t *key, data_t *input, data_t *outref)
{
mbedtls_block_cipher_context_t ctx;
mbedtls_block_cipher_init(&ctx);
mbedtls_cipher_id_t cipher_id = cipher_id_arg;
unsigned char output[BLOCK_SIZE];

mbedtls_block_cipher_init(&ctx);

memset(output, 0x00, sizeof(output));

if (do_psa_init) {
PSA_INIT();
}

TEST_EQUAL(0, mbedtls_block_cipher_setup(&ctx, cipher_id));
TEST_EQUAL(0, mbedtls_block_cipher_setkey(&ctx, key->x, 8 * key->len));

Expand All @@ -90,6 +99,7 @@ void test_vec(int cipher_id_arg, data_t *key, data_t *input, data_t *outref)

exit:
mbedtls_block_cipher_free(&ctx);
PSA_DONE();
}
/* END_CASE */

Expand Down
Loading