lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-08-08 17:42:09 +03:00
Code Activity

For tests, rename ASSERT_COMPARE() to TEST_BUFFERS_EQUAL()

Browse Source 
Signed-off-by: Tom Cosgrove <tom.cosgrove@arm.com>
This commit is contained in:
Tom Cosgrove
2023-07-20 16:46:01 +01:00
parent ed70fd0c39
commit 65cd8519f7
39 changed files with 418 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tests/suites/test_suite_ssl.function
View File

@@ -1728,7 +1728,7 @@ void ssl_tls13_hkdf_expand_label(int hash_alg,
ctx->x, ctx->len,
dst, desired_length) == 0);
ASSERT_COMPARE(dst, (size_t) desired_length,
TEST_BUFFERS_EQUAL(dst, (size_t) desired_length,
expected->x, (size_t) expected->len);
exit:
@@ -1768,19 +1768,19 @@ void ssl_tls13_traffic_key_generation(int hash_alg,
desired_key_len, desired_iv_len,
&keys) == 0);
ASSERT_COMPARE(keys.client_write_key,
TEST_BUFFERS_EQUAL(keys.client_write_key,
keys.key_len,
expected_client_write_key->x,
(size_t) desired_key_len);
ASSERT_COMPARE(keys.server_write_key,
TEST_BUFFERS_EQUAL(keys.server_write_key,
keys.key_len,
expected_server_write_key->x,
(size_t) desired_key_len);
ASSERT_COMPARE(keys.client_write_iv,
TEST_BUFFERS_EQUAL(keys.client_write_iv,
keys.iv_len,
expected_client_write_iv->x,
(size_t) desired_iv_len);
ASSERT_COMPARE(keys.server_write_iv,
TEST_BUFFERS_EQUAL(keys.server_write_iv,
keys.iv_len,
expected_server_write_iv->x,
(size_t) desired_iv_len);
@@ -1827,7 +1827,7 @@ void ssl_tls13_derive_secret(int hash_alg,
already_hashed,
dst, desired_length) == 0);
ASSERT_COMPARE(dst, desired_length,
TEST_BUFFERS_EQUAL(dst, desired_length,
expected->x, desired_length);
exit:
@@ -1859,9 +1859,9 @@ void ssl_tls13_derive_early_secrets(int hash_alg,
alg, secret->x, transcript->x, transcript->len,
&secrets) == 0);
ASSERT_COMPARE(secrets.client_early_traffic_secret, hash_len,
TEST_BUFFERS_EQUAL(secrets.client_early_traffic_secret, hash_len,
traffic_expected->x, traffic_expected->len);
ASSERT_COMPARE(secrets.early_exporter_master_secret, hash_len,
TEST_BUFFERS_EQUAL(secrets.early_exporter_master_secret, hash_len,
exporter_expected->x, exporter_expected->len);
exit:
@@ -1893,9 +1893,9 @@ void ssl_tls13_derive_handshake_secrets(int hash_alg,
alg, secret->x, transcript->x, transcript->len,
&secrets) == 0);
ASSERT_COMPARE(secrets.client_handshake_traffic_secret, hash_len,
TEST_BUFFERS_EQUAL(secrets.client_handshake_traffic_secret, hash_len,
client_expected->x, client_expected->len);
ASSERT_COMPARE(secrets.server_handshake_traffic_secret, hash_len,
TEST_BUFFERS_EQUAL(secrets.server_handshake_traffic_secret, hash_len,
server_expected->x, server_expected->len);
exit:
@@ -1929,11 +1929,11 @@ void ssl_tls13_derive_application_secrets(int hash_alg,
alg, secret->x, transcript->x, transcript->len,
&secrets) == 0);
ASSERT_COMPARE(secrets.client_application_traffic_secret_N, hash_len,
TEST_BUFFERS_EQUAL(secrets.client_application_traffic_secret_N, hash_len,
client_expected->x, client_expected->len);
ASSERT_COMPARE(secrets.server_application_traffic_secret_N, hash_len,
TEST_BUFFERS_EQUAL(secrets.server_application_traffic_secret_N, hash_len,
server_expected->x, server_expected->len);
ASSERT_COMPARE(secrets.exporter_master_secret, hash_len,
TEST_BUFFERS_EQUAL(secrets.exporter_master_secret, hash_len,
exporter_expected->x, exporter_expected->len);
exit:
@@ -1963,7 +1963,7 @@ void ssl_tls13_derive_resumption_secrets(int hash_alg,
alg, secret->x, transcript->x, transcript->len,
&secrets) == 0);
ASSERT_COMPARE(secrets.resumption_master_secret, hash_len,
TEST_BUFFERS_EQUAL(secrets.resumption_master_secret, hash_len,
resumption_expected->x, resumption_expected->len);
exit:
@@ -1997,7 +1997,7 @@ void ssl_tls13_create_psk_binder(int hash_alg,
transcript->x,
binder) == 0);
ASSERT_COMPARE(binder, hash_len,
TEST_BUFFERS_EQUAL(binder, hash_len,
binder_expected->x, binder_expected->len);
exit:
@@ -2090,12 +2090,12 @@ void ssl_tls13_record_protection(int ciphersuite,
NULL, NULL) == 0);
if (padding_used == MBEDTLS_SSL_CID_TLS1_3_PADDING_GRANULARITY) {
ASSERT_COMPARE(rec.buf + rec.data_offset, rec.data_len,
TEST_BUFFERS_EQUAL(rec.buf + rec.data_offset, rec.data_len,
ciphertext->x, ciphertext->len);
}
TEST_ASSERT(mbedtls_ssl_decrypt_buf(NULL, &transform_recv, &rec) == 0);
ASSERT_COMPARE(rec.buf + rec.data_offset, rec.data_len,
TEST_BUFFERS_EQUAL(rec.buf + rec.data_offset, rec.data_len,
plaintext->x, plaintext->len);
exit:
@@ -2122,7 +2122,7 @@ void ssl_tls13_key_evolution(int hash_alg,
input->len ? input->x : NULL, input->len,
secret_new) == 0);
ASSERT_COMPARE(secret_new, (size_t) expected->len,
TEST_BUFFERS_EQUAL(secret_new, (size_t) expected->len,
expected->x, (size_t) expected->len);
exit:
@@ -3326,7 +3326,7 @@ void cid_sanity()
== 0);
TEST_EQUAL(cid_enabled, MBEDTLS_SSL_CID_ENABLED);
ASSERT_COMPARE(own_cid, own_cid_len, test_cid, own_cid_len);
TEST_BUFFERS_EQUAL(own_cid, own_cid_len, test_cid, own_cid_len);
/* Test disabling works. */
TEST_ASSERT(mbedtls_ssl_set_cid(&ssl, MBEDTLS_SSL_CID_DISABLED, NULL,