commit e4e9e7da58ac378aba8412f013892b760f55c8b7
author Tom Cosgrove <tom.cosgrove@arm.com> Fri Jul 21 11:40:20 2023 +0100
committer Tom Cosgrove <tom.cosgrove@arm.com> Fri Jul 21 11:45:25 2023 +0100
tree 36a71d3827c822e7d5b55c0b7d790376d1eb36a9
parent a45d902822bd6972edd4cfacec00b4301edce83d

For tests, rename TEST_BUFFERS_EQUAL() to TEST_MEMORY_COMPARE()

Signed-off-by: Tom Cosgrove <tom.cosgrove@arm.com>

tests/suites/test_suite_ssl.function

diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function
index 7fdba10..b2a075b 100644
--- a/tests/suites/test_suite_ssl.function
+++ b/tests/suites/test_suite_ssl.function
@@ -1728,7 +1728,7 @@
                     ctx->x, ctx->len,
                     dst, desired_length) == 0);
 
-    TEST_BUFFERS_EQUAL(dst, (size_t) desired_length,
+    TEST_MEMORY_COMPARE(dst, (size_t) desired_length,
                    expected->x, (size_t) expected->len);
 
 exit:
@@ -1768,19 +1768,19 @@
                     desired_key_len, desired_iv_len,
                     &keys) == 0);
 
-    TEST_BUFFERS_EQUAL(keys.client_write_key,
+    TEST_MEMORY_COMPARE(keys.client_write_key,
                    keys.key_len,
                    expected_client_write_key->x,
                    (size_t) desired_key_len);
-    TEST_BUFFERS_EQUAL(keys.server_write_key,
+    TEST_MEMORY_COMPARE(keys.server_write_key,
                    keys.key_len,
                    expected_server_write_key->x,
                    (size_t) desired_key_len);
-    TEST_BUFFERS_EQUAL(keys.client_write_iv,
+    TEST_MEMORY_COMPARE(keys.client_write_iv,
                    keys.iv_len,
                    expected_client_write_iv->x,
                    (size_t) desired_iv_len);
-    TEST_BUFFERS_EQUAL(keys.server_write_iv,
+    TEST_MEMORY_COMPARE(keys.server_write_iv,
                    keys.iv_len,
                    expected_server_write_iv->x,
                    (size_t) desired_iv_len);
@@ -1827,7 +1827,7 @@
                     already_hashed,
                     dst, desired_length) == 0);
 
-    TEST_BUFFERS_EQUAL(dst, desired_length,
+    TEST_MEMORY_COMPARE(dst, desired_length,
                    expected->x, desired_length);
 
 exit:
@@ -1859,9 +1859,9 @@
                     alg, secret->x, transcript->x, transcript->len,
                     &secrets) == 0);
 
-    TEST_BUFFERS_EQUAL(secrets.client_early_traffic_secret, hash_len,
+    TEST_MEMORY_COMPARE(secrets.client_early_traffic_secret, hash_len,
                    traffic_expected->x, traffic_expected->len);
-    TEST_BUFFERS_EQUAL(secrets.early_exporter_master_secret, hash_len,
+    TEST_MEMORY_COMPARE(secrets.early_exporter_master_secret, hash_len,
                    exporter_expected->x, exporter_expected->len);
 
 exit:
@@ -1893,9 +1893,9 @@
                     alg, secret->x, transcript->x, transcript->len,
                     &secrets) == 0);
 
-    TEST_BUFFERS_EQUAL(secrets.client_handshake_traffic_secret, hash_len,
+    TEST_MEMORY_COMPARE(secrets.client_handshake_traffic_secret, hash_len,
                    client_expected->x, client_expected->len);
-    TEST_BUFFERS_EQUAL(secrets.server_handshake_traffic_secret, hash_len,
+    TEST_MEMORY_COMPARE(secrets.server_handshake_traffic_secret, hash_len,
                    server_expected->x, server_expected->len);
 
 exit:
@@ -1929,11 +1929,11 @@
                     alg, secret->x, transcript->x, transcript->len,
                     &secrets) == 0);
 
-    TEST_BUFFERS_EQUAL(secrets.client_application_traffic_secret_N, hash_len,
+    TEST_MEMORY_COMPARE(secrets.client_application_traffic_secret_N, hash_len,
                    client_expected->x, client_expected->len);
-    TEST_BUFFERS_EQUAL(secrets.server_application_traffic_secret_N, hash_len,
+    TEST_MEMORY_COMPARE(secrets.server_application_traffic_secret_N, hash_len,
                    server_expected->x, server_expected->len);
-    TEST_BUFFERS_EQUAL(secrets.exporter_master_secret, hash_len,
+    TEST_MEMORY_COMPARE(secrets.exporter_master_secret, hash_len,
                    exporter_expected->x, exporter_expected->len);
 
 exit:
@@ -1963,7 +1963,7 @@
                     alg, secret->x, transcript->x, transcript->len,
                     &secrets) == 0);
 
-    TEST_BUFFERS_EQUAL(secrets.resumption_master_secret, hash_len,
+    TEST_MEMORY_COMPARE(secrets.resumption_master_secret, hash_len,
                    resumption_expected->x, resumption_expected->len);
 
 exit:
@@ -1997,7 +1997,7 @@
                     transcript->x,
                     binder) == 0);
 
-    TEST_BUFFERS_EQUAL(binder, hash_len,
+    TEST_MEMORY_COMPARE(binder, hash_len,
                    binder_expected->x, binder_expected->len);
 
 exit:
@@ -2090,12 +2090,12 @@
                                         NULL, NULL) == 0);
 
     if (padding_used == MBEDTLS_SSL_CID_TLS1_3_PADDING_GRANULARITY) {
-        TEST_BUFFERS_EQUAL(rec.buf + rec.data_offset, rec.data_len,
+        TEST_MEMORY_COMPARE(rec.buf + rec.data_offset, rec.data_len,
                        ciphertext->x, ciphertext->len);
     }
 
     TEST_ASSERT(mbedtls_ssl_decrypt_buf(NULL, &transform_recv, &rec) == 0);
-    TEST_BUFFERS_EQUAL(rec.buf + rec.data_offset, rec.data_len,
+    TEST_MEMORY_COMPARE(rec.buf + rec.data_offset, rec.data_len,
                    plaintext->x, plaintext->len);
 
 exit:
@@ -2122,7 +2122,7 @@
                     input->len ? input->x : NULL, input->len,
                     secret_new) == 0);
 
-    TEST_BUFFERS_EQUAL(secret_new, (size_t) expected->len,
+    TEST_MEMORY_COMPARE(secret_new, (size_t) expected->len,
                    expected->x, (size_t) expected->len);
 
 exit:
@@ -3326,7 +3326,7 @@
                 == 0);
 
     TEST_EQUAL(cid_enabled, MBEDTLS_SSL_CID_ENABLED);
-    TEST_BUFFERS_EQUAL(own_cid, own_cid_len, test_cid, own_cid_len);
+    TEST_MEMORY_COMPARE(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,