Fix code style
Signed-off-by: Tom Cosgrove <tom.cosgrove@arm.com>
diff --git a/tests/suites/test_suite_aria.function b/tests/suites/test_suite_aria.function
index 7baabfa..10c51a3 100644
--- a/tests/suites/test_suite_aria.function
+++ b/tests/suites/test_suite_aria.function
@@ -225,7 +225,7 @@
}
TEST_MEMORY_COMPARE(output, expected_output->len,
- expected_output->x, expected_output->len);
+ expected_output->x, expected_output->len);
}
exit:
@@ -253,7 +253,7 @@
}
TEST_MEMORY_COMPARE(output, expected_output->len,
- expected_output->x, expected_output->len);
+ expected_output->x, expected_output->len);
}
exit:
@@ -278,7 +278,7 @@
output) == cbc_result);
if (cbc_result == 0) {
TEST_MEMORY_COMPARE(output, expected_output->len,
- expected_output->x, expected_output->len);
+ expected_output->x, expected_output->len);
}
exit:
@@ -303,7 +303,7 @@
output) == cbc_result);
if (cbc_result == 0) {
TEST_MEMORY_COMPARE(output, expected_output->len,
- expected_output->x, expected_output->len);
+ expected_output->x, expected_output->len);
}
exit:
@@ -330,7 +330,7 @@
== result);
TEST_MEMORY_COMPARE(output, expected_output->len,
- expected_output->x, expected_output->len);
+ expected_output->x, expected_output->len);
exit:
mbedtls_aria_free(&ctx);
@@ -356,7 +356,7 @@
== result);
TEST_MEMORY_COMPARE(output, expected_output->len,
- expected_output->x, expected_output->len);
+ expected_output->x, expected_output->len);
exit:
mbedtls_aria_free(&ctx);
@@ -382,7 +382,7 @@
== result);
TEST_MEMORY_COMPARE(output, expected_output->len,
- expected_output->x, expected_output->len);
+ expected_output->x, expected_output->len);
exit:
mbedtls_aria_free(&ctx);
@@ -408,7 +408,7 @@
== result);
TEST_MEMORY_COMPARE(output, expected_output->len,
- expected_output->x, expected_output->len);
+ expected_output->x, expected_output->len);
exit:
mbedtls_aria_free(&ctx);
diff --git a/tests/suites/test_suite_asn1write.function b/tests/suites/test_suite_asn1write.function
index 4b0345f..77bf4ef 100644
--- a/tests/suites/test_suite_asn1write.function
+++ b/tests/suites/test_suite_asn1write.function
@@ -38,7 +38,7 @@
TEST_ASSERT(data->p >= data->start);
TEST_ASSERT(data->p <= data->end);
TEST_MEMORY_COMPARE(data->p, (size_t) (data->end - data->p),
- expected->x, expected->len);
+ expected->x, expected->len);
}
ok = 1;
@@ -441,7 +441,7 @@
TEST_EQUAL(mbedtls_asn1_get_bitstring(&data.p, data.end,
&read), 0);
TEST_MEMORY_COMPARE(read.p, read.len,
- masked_bitstring, byte_length);
+ masked_bitstring, byte_length);
TEST_EQUAL(read.unused_bits, 8 * byte_length - value_bits);
}
#endif /* MBEDTLS_ASN1_PARSE_C */
@@ -546,7 +546,7 @@
if (new_val != NULL) {
TEST_MEMORY_COMPARE(found->val.p, found->val.len,
- new_val, (size_t) new_len);
+ new_val, (size_t) new_len);
}
if (new_len == 0) {
TEST_ASSERT(found->val.p == NULL);
@@ -588,7 +588,7 @@
} else {
TEST_ASSERT(found->val.p != new_val);
TEST_MEMORY_COMPARE(found->val.p, found->val.len,
- new_val, (size_t) new_len);
+ new_val, (size_t) new_len);
}
exit:
diff --git a/tests/suites/test_suite_chacha20.function b/tests/suites/test_suite_chacha20.function
index 66f01f4..3c6f06c 100644
--- a/tests/suites/test_suite_chacha20.function
+++ b/tests/suites/test_suite_chacha20.function
@@ -30,7 +30,7 @@
output) == 0);
TEST_MEMORY_COMPARE(output, expected_output_str->len,
- expected_output_str->x, expected_output_str->len);
+ expected_output_str->x, expected_output_str->len);
/*
* Test the streaming API
@@ -45,7 +45,7 @@
TEST_ASSERT(mbedtls_chacha20_update(&ctx, src_str->len, src_str->x, output) == 0);
TEST_MEMORY_COMPARE(output, expected_output_str->len,
- expected_output_str->x, expected_output_str->len);
+ expected_output_str->x, expected_output_str->len);
/*
* Test the streaming API again, piecewise
@@ -61,7 +61,7 @@
src_str->x + 1, output + 1) == 0);
TEST_MEMORY_COMPARE(output, expected_output_str->len,
- expected_output_str->x, expected_output_str->len);
+ expected_output_str->x, expected_output_str->len);
mbedtls_chacha20_free(&ctx);
}
diff --git a/tests/suites/test_suite_ecp.function b/tests/suites/test_suite_ecp.function
index 225572a..a3103d9 100644
--- a/tests/suites/test_suite_ecp.function
+++ b/tests/suites/test_suite_ecp.function
@@ -853,7 +853,7 @@
TEST_ASSERT(len <= MBEDTLS_ECP_MAX_PT_LEN);
TEST_MEMORY_COMPARE(expected_result->x, expected_result->len,
- actual_result, len);
+ actual_result, len);
exit:
mbedtls_ecp_group_free(&grp);
@@ -1357,7 +1357,7 @@
TEST_ASSERT(ret == 0);
TEST_MEMORY_COMPARE(in_key->x, in_key->len,
- buf, in_key->len);
+ buf, in_key->len);
} else {
unsigned char export1[MBEDTLS_ECP_MAX_BYTES];
unsigned char export2[MBEDTLS_ECP_MAX_BYTES];
@@ -1372,7 +1372,7 @@
TEST_ASSERT(ret == 0);
TEST_MEMORY_COMPARE(export1, in_key->len,
- export2, in_key->len);
+ export2, in_key->len);
}
}
@@ -1449,7 +1449,7 @@
* - Other bits must be random (by testing with different RNG outputs,
* we validate that those bits are indeed influenced by the RNG). */
TEST_MEMORY_COMPARE(expected->x, expected->len,
- actual, expected->len);
+ actual, expected->len);
}
exit:
diff --git a/tests/suites/test_suite_hkdf.function b/tests/suites/test_suite_hkdf.function
index a729847..f307a7d 100644
--- a/tests/suites/test_suite_hkdf.function
+++ b/tests/suites/test_suite_hkdf.function
@@ -25,7 +25,7 @@
TEST_ASSERT(ret == 0);
TEST_MEMORY_COMPARE(okm, expected_okm->len,
- expected_okm->x, expected_okm->len);
+ expected_okm->x, expected_okm->len);
}
/* END_CASE */
diff --git a/tests/suites/test_suite_mps.function b/tests/suites/test_suite_mps.function
index 1bc1b3e..03818ec 100644
--- a/tests/suites/test_suite_mps.function
+++ b/tests/suites/test_suite_mps.function
@@ -611,8 +611,8 @@
TEST_ASSERT(mbedtls_mps_reader_get(&rd, sizeof(buf) / 2,
&tmp, NULL) == 0);
TEST_MEMORY_COMPARE(tmp, sizeof(buf) / 2,
- buf + sizeof(buf) / 2,
- sizeof(buf) / 2);
+ buf + sizeof(buf) / 2,
+ sizeof(buf) / 2);
break;
default:
diff --git a/tests/suites/test_suite_pkcs12.function b/tests/suites/test_suite_pkcs12.function
index 4334f55..0d39912 100644
--- a/tests/suites/test_suite_pkcs12.function
+++ b/tests/suites/test_suite_pkcs12.function
@@ -58,7 +58,7 @@
if (expected_status == 0) {
TEST_MEMORY_COMPARE(expected_output->x, expected_output->len,
- output_data, key_size);
+ output_data, key_size);
}
exit:
diff --git a/tests/suites/test_suite_pkwrite.function b/tests/suites/test_suite_pkwrite.function
index e6bcb26..d1f7813 100644
--- a/tests/suites/test_suite_pkwrite.function
+++ b/tests/suites/test_suite_pkwrite.function
@@ -151,7 +151,7 @@
derived_key_len), pub_key_len);
TEST_MEMORY_COMPARE(derived_key_raw, derived_key_len,
- pub_key_raw, pub_key_len);
+ pub_key_raw, pub_key_len);
#if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_platform_zeroize(derived_key_raw, derived_key_len);
@@ -163,7 +163,7 @@
derived_key_len), pub_key_len);
TEST_MEMORY_COMPARE(derived_key_raw, derived_key_len,
- pub_key_raw, pub_key_len);
+ pub_key_raw, pub_key_len);
#endif /* MBEDTLS_USE_PSA_CRYPTO */
exit:
diff --git a/tests/suites/test_suite_poly1305.function b/tests/suites/test_suite_poly1305.function
index ff09428..c391c86 100644
--- a/tests/suites/test_suite_poly1305.function
+++ b/tests/suites/test_suite_poly1305.function
@@ -23,7 +23,7 @@
src_str->len, mac) == 0);
TEST_MEMORY_COMPARE(mac, expected_mac->len,
- expected_mac->x, expected_mac->len);
+ expected_mac->x, expected_mac->len);
/*
* Test the streaming API
@@ -37,7 +37,7 @@
TEST_ASSERT(mbedtls_poly1305_finish(&ctx, mac) == 0);
TEST_MEMORY_COMPARE(mac, expected_mac->len,
- expected_mac->x, expected_mac->len);
+ expected_mac->x, expected_mac->len);
/*
* Test the streaming API again, piecewise
@@ -54,7 +54,7 @@
TEST_ASSERT(mbedtls_poly1305_finish(&ctx, mac) == 0);
TEST_MEMORY_COMPARE(mac, expected_mac->len,
- expected_mac->x, expected_mac->len);
+ expected_mac->x, expected_mac->len);
}
/*
@@ -70,7 +70,7 @@
TEST_ASSERT(mbedtls_poly1305_finish(&ctx, mac) == 0);
TEST_MEMORY_COMPARE(mac, expected_mac->len,
- expected_mac->x, expected_mac->len);
+ expected_mac->x, expected_mac->len);
}
mbedtls_poly1305_free(&ctx);
diff --git a/tests/suites/test_suite_psa_crypto.function b/tests/suites/test_suite_psa_crypto.function
index 8a20bc4..0db5bff 100644
--- a/tests/suites/test_suite_psa_crypto.function
+++ b/tests/suites/test_suite_psa_crypto.function
@@ -633,7 +633,7 @@
export_size,
&reexported_length));
TEST_MEMORY_COMPARE(exported, exported_length,
- reexported, reexported_length);
+ reexported, reexported_length);
PSA_ASSERT(psa_destroy_key(key2));
}
TEST_ASSERT(exported_length <=
@@ -704,7 +704,7 @@
TEST_LE_U(expected_public_key->len,
PSA_EXPORT_PUBLIC_KEY_MAX_SIZE);
TEST_MEMORY_COMPARE(expected_public_key->x, expected_public_key->len,
- exported, exported_length);
+ exported, exported_length);
}
exit:
@@ -1450,7 +1450,7 @@
PSA_ASSERT(psa_export_key(target_key, export_buffer,
material->len, &length));
TEST_MEMORY_COMPARE(material->x, material->len,
- export_buffer, length);
+ export_buffer, length);
}
if (!mbedtls_test_psa_exercise_key(target_key, expected_usage, expected_alg)) {
@@ -1651,7 +1651,7 @@
&output_length));
TEST_EQUAL(output_length, PSA_HASH_LENGTH(alg));
TEST_MEMORY_COMPARE(output, output_length,
- expected_output->x, expected_output->len);
+ expected_output->x, expected_output->len);
/* Compute with larger buffer */
PSA_ASSERT(psa_hash_compute(alg, input->x, input->len,
@@ -1659,7 +1659,7 @@
&output_length));
TEST_EQUAL(output_length, PSA_HASH_LENGTH(alg));
TEST_MEMORY_COMPARE(output, output_length,
- expected_output->x, expected_output->len);
+ expected_output->x, expected_output->len);
/* Compare with correct hash */
PSA_ASSERT(psa_hash_compare(alg, input->x, input->len,
@@ -2196,7 +2196,7 @@
expected_status);
if (expected_status == PSA_SUCCESS) {
TEST_MEMORY_COMPARE(expected_mac->x, expected_mac->len,
- actual_mac, mac_length);
+ actual_mac, mac_length);
}
if (output_size > 0) {
@@ -2215,7 +2215,7 @@
if (expected_status == PSA_SUCCESS) {
TEST_MEMORY_COMPARE(expected_mac->x, expected_mac->len,
- actual_mac, mac_length);
+ actual_mac, mac_length);
}
mbedtls_free(actual_mac);
actual_mac = NULL;
@@ -2698,7 +2698,7 @@
&length));
output_length += length;
TEST_MEMORY_COMPARE(ciphertext->x, ciphertext->len,
- output, output_length);
+ output, output_length);
/* Multipart encryption */
PSA_ASSERT(psa_cipher_decrypt_setup(&operation, key, alg));
@@ -2716,7 +2716,7 @@
&length));
output_length += length;
TEST_MEMORY_COMPARE(plaintext->x, plaintext->len,
- output, output_length);
+ output, output_length);
/* One-shot encryption */
output_length = ~0;
@@ -2724,7 +2724,7 @@
output, output_buffer_size,
&output_length));
TEST_MEMORY_COMPARE(ciphertext->x, ciphertext->len,
- output, output_length);
+ output, output_length);
/* One-shot decryption */
output_length = ~0;
@@ -2732,7 +2732,7 @@
output, output_buffer_size,
&output_length));
TEST_MEMORY_COMPARE(plaintext->x, plaintext->len,
- output, output_length);
+ output, output_length);
exit:
mbedtls_free(output);
@@ -2851,7 +2851,7 @@
PSA_ASSERT(psa_cipher_abort(&operation));
TEST_MEMORY_COMPARE(output1 + iv_size, output1_length - iv_size,
- output2, output2_length);
+ output2, output2_length);
exit:
psa_cipher_abort(&operation);
@@ -2950,7 +2950,7 @@
PSA_ASSERT(psa_cipher_abort(&operation));
TEST_MEMORY_COMPARE(expected_output->x, expected_output->len,
- output, total_output_length);
+ output, total_output_length);
}
exit:
@@ -3050,7 +3050,7 @@
PSA_ASSERT(psa_cipher_abort(&operation));
TEST_MEMORY_COMPARE(expected_output->x, expected_output->len,
- output, total_output_length);
+ output, total_output_length);
}
exit:
@@ -3161,7 +3161,7 @@
PSA_CIPHER_DECRYPT_OUTPUT_MAX_SIZE(input_buffer_size));
TEST_MEMORY_COMPARE(expected_output->x, expected_output->len,
- output, output_length);
+ output, output_length);
exit:
mbedtls_free(input);
mbedtls_free(output);
@@ -3453,7 +3453,7 @@
expected_result);
TEST_MEMORY_COMPARE(input_data->x, input_data->len,
- output_data2, output_length2);
+ output_data2, output_length2);
}
exit:
@@ -3520,7 +3520,7 @@
PSA_ASSERT(status);
TEST_MEMORY_COMPARE(expected_result->x, expected_result->len,
- output_data, output_length);
+ output_data, output_length);
exit:
psa_destroy_key(key);
@@ -3593,7 +3593,7 @@
if (expected_result == PSA_SUCCESS) {
TEST_MEMORY_COMPARE(expected_data->x, expected_data->len,
- output_data, output_length);
+ output_data, output_length);
}
exit:
@@ -3664,7 +3664,7 @@
&signature_length));
/* Verify that the signature is what is expected. */
TEST_MEMORY_COMPARE(output_data->x, output_data->len,
- signature, signature_length);
+ signature, signature_length);
#if defined(MBEDTLS_TEST_DEPRECATED)
memset(signature, 0, signature_size);
@@ -3674,7 +3674,7 @@
signature, signature_size,
&signature_length));
TEST_MEMORY_COMPARE(output_data->x, output_data->len,
- signature, signature_length);
+ signature, signature_length);
#endif /* MBEDTLS_TEST_DEPRECATED */
exit:
@@ -3934,7 +3934,7 @@
&signature_length));
TEST_MEMORY_COMPARE(output_data->x, output_data->len,
- signature, signature_length);
+ signature, signature_length);
exit:
psa_reset_key_attributes(&attributes);
@@ -4272,7 +4272,7 @@
output2, output2_size,
&output2_length));
TEST_MEMORY_COMPARE(input_data->x, input_data->len,
- output2, output2_length);
+ output2, output2_length);
exit:
/*
@@ -4329,7 +4329,7 @@
output_size,
&output_length));
TEST_MEMORY_COMPARE(expected_data->x, expected_data->len,
- output, output_length);
+ output, output_length);
/* If the label is empty, the test framework puts a non-null pointer
* in label->x. Test that a null pointer works as well. */
@@ -4345,7 +4345,7 @@
output_size,
&output_length));
TEST_MEMORY_COMPARE(expected_data->x, expected_data->len,
- output, output_length);
+ output, output_length);
}
exit:
@@ -4757,7 +4757,7 @@
PSA_ASSERT(status);
if (output_sizes[i] != 0) {
TEST_MEMORY_COMPARE(output_buffer, output_sizes[i],
- expected_outputs[i], output_sizes[i]);
+ expected_outputs[i], output_sizes[i]);
}
/* Check the operation status. */
expected_capacity -= output_sizes[i];
@@ -4983,7 +4983,7 @@
/* Compare the outputs from the two runs. */
TEST_MEMORY_COMPARE(output_buffer, bytes1 + bytes2,
- export_buffer, capacity);
+ export_buffer, capacity);
exit:
mbedtls_free(output_buffer);
@@ -5134,7 +5134,7 @@
output, expected_output->len,
&output_length));
TEST_MEMORY_COMPARE(output, output_length,
- expected_output->x, expected_output->len);
+ expected_output->x, expected_output->len);
mbedtls_free(output);
output = NULL;
output_length = ~0;
@@ -5146,7 +5146,7 @@
output, expected_output->len + 1,
&output_length));
TEST_MEMORY_COMPARE(output, output_length,
- expected_output->x, expected_output->len);
+ expected_output->x, expected_output->len);
mbedtls_free(output);
output = NULL;
output_length = ~0;
@@ -5242,7 +5242,7 @@
uint8_t *actual_output = NULL;
TEST_CALLOC(actual_output, MAX(expected_output1->len,
- expected_output2->len));
+ expected_output2->len));
PSA_ASSERT(psa_crypto_init());
@@ -5269,13 +5269,13 @@
actual_output,
expected_output1->len));
TEST_MEMORY_COMPARE(actual_output, expected_output1->len,
- expected_output1->x, expected_output1->len);
+ expected_output1->x, expected_output1->len);
if (expected_output2->len != 0) {
PSA_ASSERT(psa_key_derivation_output_bytes(&operation,
actual_output,
expected_output2->len));
TEST_MEMORY_COMPARE(actual_output, expected_output2->len,
- expected_output2->x, expected_output2->len);
+ expected_output2->x, expected_output2->len);
}
exit:
@@ -5589,7 +5589,7 @@
&first_exported_length));
if (generation_method == IMPORT_KEY) {
TEST_MEMORY_COMPARE(data->x, data->len,
- first_export, first_exported_length);
+ first_export, first_exported_length);
}
}
@@ -5616,7 +5616,7 @@
second_export, export_size,
&second_exported_length));
TEST_MEMORY_COMPARE(first_export, first_exported_length,
- second_export, second_exported_length);
+ second_export, second_exported_length);
}
/* Do something with the key according to its type and permitted usage. */
diff --git a/tests/suites/test_suite_psa_crypto_driver_wrappers.function b/tests/suites/test_suite_psa_crypto_driver_wrappers.function
index 33aefe7..b789908 100644
--- a/tests/suites/test_suite_psa_crypto_driver_wrappers.function
+++ b/tests/suites/test_suite_psa_crypto_driver_wrappers.function
@@ -65,7 +65,7 @@
TEST_EQUAL(actual_status, expected_status);
if (expected_status == PSA_SUCCESS) {
TEST_MEMORY_COMPARE(signature, signature_length,
- expected_output->x, expected_output->len);
+ expected_output->x, expected_output->len);
}
TEST_EQUAL(mbedtls_test_driver_signature_sign_hooks.hits, 1);
@@ -192,7 +192,7 @@
TEST_EQUAL(actual_status, expected_status);
if (expected_status == PSA_SUCCESS) {
TEST_MEMORY_COMPARE(signature, signature_length,
- expected_output->x, expected_output->len);
+ expected_output->x, expected_output->len);
}
/* In the builtin algorithm the driver is called twice. */
TEST_EQUAL(mbedtls_test_driver_signature_sign_hooks.hits,
@@ -314,7 +314,7 @@
if (fake_output->len > 0) {
TEST_MEMORY_COMPARE(actual_output, actual_output_length,
- expected_output, expected_output_length);
+ expected_output, expected_output_length);
} else {
size_t zeroes = 0;
for (size_t i = 0; i < sizeof(actual_output); i++) {
@@ -446,7 +446,7 @@
if (actual_status == PSA_SUCCESS) {
TEST_MEMORY_COMPARE(actual_output, actual_output_length,
- expected_output_ptr, expected_output_length);
+ expected_output_ptr, expected_output_length);
}
exit:
psa_reset_key_attributes(&attributes);
@@ -528,7 +528,7 @@
// driver function should've been called as part of the finish() core routine
TEST_EQUAL(mbedtls_test_driver_cipher_hooks.hits, 0);
TEST_MEMORY_COMPARE(output1 + iv_size, output1_length - iv_size,
- output2, output2_length);
+ output2, output2_length);
exit:
psa_cipher_abort(&operation);
@@ -656,7 +656,7 @@
TEST_EQUAL(mbedtls_test_driver_cipher_hooks.hits, 0);
TEST_MEMORY_COMPARE(expected_output->x, expected_output->len,
- output, total_output_length);
+ output, total_output_length);
}
exit:
@@ -785,7 +785,7 @@
TEST_EQUAL(mbedtls_test_driver_cipher_hooks.hits, 0);
TEST_MEMORY_COMPARE(expected_output->x, expected_output->len,
- output, total_output_length);
+ output, total_output_length);
}
exit:
@@ -857,7 +857,7 @@
if (expected_status == PSA_SUCCESS) {
TEST_MEMORY_COMPARE(expected_output->x, expected_output->len,
- output, output_length);
+ output, output_length);
}
exit:
@@ -1142,7 +1142,7 @@
if (status == PSA_SUCCESS) {
TEST_MEMORY_COMPARE(expected_result->x, expected_result->len,
- output_data, output_length);
+ output_data, output_length);
}
exit:
@@ -1205,7 +1205,7 @@
if (status == PSA_SUCCESS) {
TEST_MEMORY_COMPARE(expected_data->x, expected_data->len,
- output_data, output_length);
+ output_data, output_length);
}
exit:
@@ -1327,7 +1327,7 @@
if (forced_status == PSA_SUCCESS) {
TEST_MEMORY_COMPARE(expected_mac->x, expected_mac->len,
- actual_mac, mac_length);
+ actual_mac, mac_length);
}
mbedtls_free(actual_mac);
@@ -1478,7 +1478,7 @@
PSA_ASSERT(actual_status);
TEST_EQUAL(output_size, expected_output->len);
TEST_MEMORY_COMPARE(output_buffer, output_size,
- expected_output->x, expected_output->len);
+ expected_output->x, expected_output->len);
PSA_ASSERT(psa_get_key_attributes(key, &attributes));
TEST_EQUAL(psa_get_key_bits(&attributes), builtin_key_bits);
@@ -1529,7 +1529,7 @@
PSA_ASSERT(actual_status);
TEST_EQUAL(output_size, expected_output->len);
TEST_MEMORY_COMPARE(output_buffer, output_size,
- expected_output->x, expected_output->len);
+ expected_output->x, expected_output->len);
PSA_ASSERT(psa_get_key_attributes(key, &attributes));
TEST_EQUAL(psa_get_key_bits(&attributes), builtin_key_bits);
diff --git a/tests/suites/test_suite_psa_crypto_hash.function b/tests/suites/test_suite_psa_crypto_hash.function
index 28b556c..0405c1d 100644
--- a/tests/suites/test_suite_psa_crypto_hash.function
+++ b/tests/suites/test_suite_psa_crypto_hash.function
@@ -26,7 +26,7 @@
actual_hash, sizeof(actual_hash),
&actual_hash_length));
TEST_MEMORY_COMPARE(expected_hash->x, expected_hash->len,
- actual_hash, actual_hash_length);
+ actual_hash, actual_hash_length);
exit:
psa_hash_abort(&operation);
@@ -84,13 +84,13 @@
actual_hash, sizeof(actual_hash),
&actual_hash_length));
TEST_MEMORY_COMPARE(expected_hash->x, expected_hash->len,
- actual_hash, actual_hash_length);
+ actual_hash, actual_hash_length);
PSA_ASSERT(psa_hash_finish(&operation2,
actual_hash, sizeof(actual_hash),
&actual_hash_length));
TEST_MEMORY_COMPARE(expected_hash->x, expected_hash->len,
- actual_hash, actual_hash_length);
+ actual_hash, actual_hash_length);
} while (len++ != input->len);
exit:
diff --git a/tests/suites/test_suite_psa_crypto_persistent_key.function b/tests/suites/test_suite_psa_crypto_persistent_key.function
index 281fc8d..8f6a57f 100644
--- a/tests/suites/test_suite_psa_crypto_persistent_key.function
+++ b/tests/suites/test_suite_psa_crypto_persistent_key.function
@@ -67,7 +67,7 @@
file_data);
TEST_MEMORY_COMPARE(expected_file_data->x, expected_file_data->len,
- file_data, file_data_length);
+ file_data, file_data_length);
exit:
mbedtls_free(file_data);
@@ -112,7 +112,7 @@
TEST_EQUAL(psa_get_key_enrollment_algorithm(&attributes),
(uint32_t) expected_key_alg2);
TEST_MEMORY_COMPARE(expected_key_data->x, expected_key_data->len,
- key_data, key_data_length);
+ key_data, key_data_length);
exit:
mbedtls_free(key_data);
diff --git a/tests/suites/test_suite_psa_crypto_se_driver_hal.function b/tests/suites/test_suite_psa_crypto_se_driver_hal.function
index fd8fd63..15232a4 100644
--- a/tests/suites/test_suite_psa_crypto_se_driver_hal.function
+++ b/tests/suites/test_suite_psa_crypto_se_driver_hal.function
@@ -959,7 +959,7 @@
exported, sizeof(exported),
&exported_length));
TEST_MEMORY_COMPARE(key_material, sizeof(key_material),
- exported, exported_length);
+ exported, exported_length);
PSA_ASSERT(psa_destroy_key(returned_id));
if (!check_persistent_data(location,
diff --git a/tests/suites/test_suite_psa_crypto_slot_management.function b/tests/suites/test_suite_psa_crypto_slot_management.function
index 68f3f4b..5bd12eb 100644
--- a/tests/suites/test_suite_psa_crypto_slot_management.function
+++ b/tests/suites/test_suite_psa_crypto_slot_management.function
@@ -308,7 +308,7 @@
PSA_ASSERT(psa_export_key(id, reexported, key_data->len,
&reexported_length));
TEST_MEMORY_COMPARE(key_data->x, key_data->len,
- reexported, reexported_length);
+ reexported, reexported_length);
} else {
TEST_EQUAL(psa_export_key(id, reexported,
key_data->len, &reexported_length),
@@ -403,7 +403,7 @@
reexported, sizeof(reexported),
&reexported_length));
TEST_MEMORY_COMPARE(material1, sizeof(material1),
- reexported, reexported_length);
+ reexported, reexported_length);
PSA_ASSERT(psa_close_key(id));
@@ -579,7 +579,7 @@
PSA_ASSERT(psa_export_key(returned_target_id, export_buffer,
material->len, &length));
TEST_MEMORY_COMPARE(material->x, material->len,
- export_buffer, length);
+ export_buffer, length);
} else {
size_t length;
/* Check that the key is actually non-exportable. */
@@ -693,7 +693,7 @@
PSA_ASSERT(psa_export_key(returned_target_id, export_buffer,
target_material->len, &length));
TEST_MEMORY_COMPARE(target_material->x, target_material->len,
- export_buffer, length);
+ export_buffer, length);
}
PSA_ASSERT(psa_destroy_key(returned_source_id));
@@ -841,7 +841,7 @@
exported, sizeof(exported),
&exported_length));
TEST_MEMORY_COMPARE(exported, exported_length,
- (uint8_t *) &i, sizeof(i));
+ (uint8_t *) &i, sizeof(i));
}
PSA_ASSERT(psa_close_key(keys[i - 1]));
@@ -918,7 +918,7 @@
exported, sizeof(exported),
&exported_length));
TEST_MEMORY_COMPARE(exported, exported_length,
- (uint8_t *) &i, sizeof(i));
+ (uint8_t *) &i, sizeof(i));
PSA_ASSERT(psa_destroy_key(key));
}
@@ -1017,7 +1017,7 @@
exported, sizeof(exported),
&exported_length));
TEST_MEMORY_COMPARE(exported, exported_length,
- (uint8_t *) &i, sizeof(i));
+ (uint8_t *) &i, sizeof(i));
PSA_ASSERT(psa_destroy_key(keys[i]));
}
@@ -1029,7 +1029,7 @@
PSA_ASSERT(psa_export_key(persistent_key, exported, sizeof(exported),
&exported_length));
TEST_MEMORY_COMPARE(exported, exported_length,
- (uint8_t *) &persistent_key, sizeof(persistent_key));
+ (uint8_t *) &persistent_key, sizeof(persistent_key));
exit:
/*
* Key attributes may have been returned by psa_get_key_attributes()
diff --git a/tests/suites/test_suite_psa_crypto_storage_format.function b/tests/suites/test_suite_psa_crypto_storage_format.function
index 6637a37..2f68409 100644
--- a/tests/suites/test_suite_psa_crypto_storage_format.function
+++ b/tests/suites/test_suite_psa_crypto_storage_format.function
@@ -40,7 +40,7 @@
PSA_ASSERT(psa_its_get(uid, 0, storage_info.size,
actual_representation, &length));
TEST_MEMORY_COMPARE(expected_representation->x, expected_representation->len,
- actual_representation, length);
+ actual_representation, length);
ok = 1;
@@ -273,7 +273,7 @@
exported_material, expected_material->len,
&length));
TEST_MEMORY_COMPARE(expected_material->x, expected_material->len,
- exported_material, length);
+ exported_material, length);
}
if ((flags & TEST_FLAG_EXERCISE) && can_exercise(&actual_attributes)) {
diff --git a/tests/suites/test_suite_psa_its.function b/tests/suites/test_suite_psa_its.function
index d3c19d1..0f66c79 100644
--- a/tests/suites/test_suite_psa_its.function
+++ b/tests/suites/test_suite_psa_its.function
@@ -168,7 +168,7 @@
"Content of file 0x%08lx", (unsigned long) uid);
PSA_ASSERT(psa_its_get(uid, 0, sizeof(stored), retrieved, &ret_len));
TEST_MEMORY_COMPARE(retrieved, ret_len,
- stored, sizeof(stored));
+ stored, sizeof(stored));
PSA_ASSERT(psa_its_remove(uid));
TEST_ASSERT(psa_its_get(uid, 0, 0, NULL, NULL) ==
PSA_ERROR_DOES_NOT_EXIST);
@@ -224,7 +224,7 @@
TEST_ASSERT(status == (psa_status_t) expected_status);
if (status == PSA_SUCCESS) {
TEST_MEMORY_COMPARE(data->x + offset, (size_t) length_arg,
- buffer, ret_len);
+ buffer, ret_len);
}
for (i = 0; i < 16; i++) {
TEST_ASSERT(trailer[i] == '-');
diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function
index de9f13c..02c3799 100644
--- a/tests/suites/test_suite_ssl.function
+++ b/tests/suites/test_suite_ssl.function
@@ -1690,7 +1690,7 @@
dst, desired_length) == 0);
TEST_MEMORY_COMPARE(dst, (size_t) desired_length,
- expected->x, (size_t) expected->len);
+ expected->x, (size_t) expected->len);
}
/* END_CASE */
@@ -1725,21 +1725,21 @@
&keys) == 0);
TEST_MEMORY_COMPARE(keys.client_write_key,
- keys.key_len,
- expected_client_write_key->x,
- (size_t) desired_key_len);
+ keys.key_len,
+ expected_client_write_key->x,
+ (size_t) desired_key_len);
TEST_MEMORY_COMPARE(keys.server_write_key,
- keys.key_len,
- expected_server_write_key->x,
- (size_t) desired_key_len);
+ keys.key_len,
+ expected_server_write_key->x,
+ (size_t) desired_key_len);
TEST_MEMORY_COMPARE(keys.client_write_iv,
- keys.iv_len,
- expected_client_write_iv->x,
- (size_t) desired_iv_len);
+ keys.iv_len,
+ expected_client_write_iv->x,
+ (size_t) desired_iv_len);
TEST_MEMORY_COMPARE(keys.server_write_iv,
- keys.iv_len,
- expected_server_write_iv->x,
- (size_t) desired_iv_len);
+ keys.iv_len,
+ expected_server_write_iv->x,
+ (size_t) desired_iv_len);
}
/* END_CASE */
@@ -1779,7 +1779,7 @@
dst, desired_length) == 0);
TEST_MEMORY_COMPARE(dst, desired_length,
- expected->x, desired_length);
+ expected->x, desired_length);
}
/* END_CASE */
@@ -1798,7 +1798,7 @@
secret_new) == 0);
TEST_MEMORY_COMPARE(secret_new, (size_t) expected->len,
- expected->x, (size_t) expected->len);
+ expected->x, (size_t) expected->len);
}
/* END_CASE */