mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-02-10 15:40:30 +00:00
Assert non-empty data when needed
Pacify Coverity about subtracting from the length, and give a signal to human readers. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
parent
efe30760e5
commit
42919e0821
@ -579,6 +579,9 @@ void mbedtls_ccm_overflow_ad(int cipher_id, int mode,
|
||||
mbedtls_ccm_context ctx;
|
||||
mbedtls_ccm_init(&ctx);
|
||||
|
||||
/* This test can't be run with empty additional data */
|
||||
TEST_LE_U(1, add->len);
|
||||
|
||||
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));
|
||||
@ -654,6 +657,9 @@ void mbedtls_ccm_incomplete_ad(int cipher_id, int mode,
|
||||
mbedtls_ccm_init(&ctx);
|
||||
uint8_t *output = NULL;
|
||||
|
||||
/* This test can't be run with empty additional data */
|
||||
TEST_LE_U(1, add->len);
|
||||
|
||||
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));
|
||||
@ -709,6 +715,9 @@ void mbedtls_ccm_incomplete_ad_and_overflow(int cipher_id, int mode,
|
||||
mbedtls_ccm_init(&ctx);
|
||||
uint8_t add_second_buffer[2];
|
||||
|
||||
/* This test can't be run with empty additional data */
|
||||
TEST_LE_U(1, add->len);
|
||||
|
||||
add_second_buffer[0] = add->x[add->len - 1];
|
||||
add_second_buffer[1] = 0xAB; // some magic value
|
||||
|
||||
@ -739,6 +748,9 @@ void mbedtls_ccm_overflow_update(int cipher_id, int mode,
|
||||
uint8_t *output = NULL;
|
||||
size_t olen;
|
||||
|
||||
/* This test can't be run with an empty message */
|
||||
TEST_LE_U(1, msg->len);
|
||||
|
||||
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));
|
||||
@ -769,6 +781,9 @@ void mbedtls_ccm_incomplete_update(int cipher_id, int mode,
|
||||
uint8_t *output = NULL;
|
||||
size_t olen;
|
||||
|
||||
/* This test can't be run with an empty message */
|
||||
TEST_LE_U(1, msg->len);
|
||||
|
||||
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));
|
||||
@ -839,6 +854,9 @@ void mbedtls_ccm_incomplete_update_overflow(int cipher_id, int mode,
|
||||
size_t olen;
|
||||
uint8_t msg_second_buffer[2];
|
||||
|
||||
/* This test can't be run with an empty message */
|
||||
TEST_LE_U(1, msg->len);
|
||||
|
||||
msg_second_buffer[0] = msg->x[msg->len - 1];
|
||||
msg_second_buffer[1] = 0xAB; // some magic value
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user