yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use modern macros for calloc in test code

Browse source 
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2023-10-17 17:31:50 +02:00
parent bb7d92c4b2
commit d681ffdb54
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tests/suites/test_suite_ssl.function
View file

@ -1199,7 +1199,7 @@ void ssl_crypt_record(int cipher_type, int hash_id,
TEST_ASSERT(ret == 0); TEST_ASSERT(ret == 0);
TEST_ASSERT((buf = mbedtls_calloc(1, buflen)) != NULL); TEST_CALLOC(buf, buflen);
while (num_records-- > 0) { while (num_records-- > 0) {
mbedtls_ssl_transform *t_dec, *t_enc; mbedtls_ssl_transform *t_dec, *t_enc;
@ -1353,7 +1353,7 @@ void ssl_crypt_record_small(int cipher_type, int hash_id,
TEST_ASSERT(ret == 0); TEST_ASSERT(ret == 0);
TEST_ASSERT((buf = mbedtls_calloc(1, buflen)) != NULL); TEST_CALLOC(buf, buflen);
for (mode = 1; mode <= 3; mode++) { for (mode = 1; mode <= 3; mode++) {
seen_success = 0; seen_success = 0;
@ -1957,7 +1957,7 @@ void ssl_serialize_session_save_load(int ticket_len, char *crt_file,
/* Serialize it */ /* Serialize it */
TEST_ASSERT(mbedtls_ssl_session_save(&original, NULL, 0, &len) TEST_ASSERT(mbedtls_ssl_session_save(&original, NULL, 0, &len)
== MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL); == MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL);
TEST_ASSERT((buf = mbedtls_calloc(1, len)) != NULL); TEST_CALLOC(buf, len);
TEST_ASSERT(mbedtls_ssl_session_save(&original, buf, len, &len) TEST_ASSERT(mbedtls_ssl_session_save(&original, buf, len, &len)
== 0); == 0);
@ -2171,7 +2171,8 @@ void ssl_serialize_session_save_buf_size(int ticket_len, char *crt_file,
for (bad_len = 1; bad_len < good_len; bad_len++) { for (bad_len = 1; bad_len < good_len; bad_len++) {
/* Allocate exact size so that asan/valgrind can detect any overwrite */ /* Allocate exact size so that asan/valgrind can detect any overwrite */
mbedtls_free(buf); mbedtls_free(buf);
TEST_ASSERT((buf = mbedtls_calloc(1, bad_len)) != NULL); buf = NULL;
TEST_CALLOC(buf, bad_len);
TEST_ASSERT(mbedtls_ssl_session_save(&session, buf, bad_len, TEST_ASSERT(mbedtls_ssl_session_save(&session, buf, bad_len,
&test_len) &test_len)
== MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL); == MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL);
@ -2214,7 +2215,7 @@ void ssl_serialize_session_load_buf_size(int ticket_len, char *crt_file,
} }
TEST_ASSERT(mbedtls_ssl_session_save(&session, NULL, 0, &good_len) TEST_ASSERT(mbedtls_ssl_session_save(&session, NULL, 0, &good_len)
== MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL); == MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL);
TEST_ASSERT((good_buf = mbedtls_calloc(1, good_len)) != NULL); TEST_CALLOC(good_buf, good_len);
TEST_ASSERT(mbedtls_ssl_session_save(&session, good_buf, good_len, TEST_ASSERT(mbedtls_ssl_session_save(&session, good_buf, good_len,
&good_len) == 0); &good_len) == 0);
mbedtls_ssl_session_free(&session); mbedtls_ssl_session_free(&session);
@ -2223,8 +2224,8 @@ void ssl_serialize_session_load_buf_size(int ticket_len, char *crt_file,
for (bad_len = 0; bad_len < good_len; bad_len++) { for (bad_len = 0; bad_len < good_len; bad_len++) {
/* Allocate exact size so that asan/valgrind can detect any overread */ /* Allocate exact size so that asan/valgrind can detect any overread */
mbedtls_free(bad_buf); mbedtls_free(bad_buf);
bad_buf = mbedtls_calloc(1, bad_len ? bad_len : 1); bad_buf = NULL;
TEST_ASSERT(bad_buf != NULL); TEST_CALLOC_NONNULL(bad_buf, bad_len);
memcpy(bad_buf, good_buf, bad_len); memcpy(bad_buf, good_buf, bad_len);
TEST_ASSERT(mbedtls_ssl_session_load(&session, bad_buf, bad_len) TEST_ASSERT(mbedtls_ssl_session_load(&session, bad_buf, bad_len)