Fix code style
Signed-off-by: Tom Cosgrove <tom.cosgrove@arm.com>
diff --git a/tests/suites/test_suite_psa_crypto.function b/tests/suites/test_suite_psa_crypto.function
index a58e48b..2182ad0 100644
--- a/tests/suites/test_suite_psa_crypto.function
+++ b/tests/suites/test_suite_psa_crypto.function
@@ -584,7 +584,7 @@
TEST_MEMORY_COMPARE(expected_output->x, expected_output->len,
- output_data, output_length);
+ output_data, output_length);
test_ok = 1;
@@ -693,7 +693,7 @@
PSA_MAC_MAX_SIZE, &mac_len));
TEST_MEMORY_COMPARE(expected_output->x, expected_output->len,
- mac, mac_len);
+ mac, mac_len);
}
test_ok = 1;
@@ -1584,7 +1584,7 @@
export_size,
&reexported_length));
TEST_MEMORY_COMPARE(exported, exported_length,
- reexported, reexported_length);
+ reexported, reexported_length);
PSA_ASSERT(psa_destroy_key(key2));
}
TEST_LE_U(exported_length,
@@ -1658,7 +1658,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:
/*
@@ -2502,7 +2502,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 (!psa_key_lifetime_is_external(target_lifetime)) {
@@ -2761,7 +2761,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 tight buffer, multi-part */
PSA_ASSERT(psa_hash_setup(&operation, alg));
@@ -2771,7 +2771,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, one-shot */
PSA_ASSERT(psa_hash_compute(alg, input->x, input->len,
@@ -2779,7 +2779,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, multi-part */
PSA_ASSERT(psa_hash_setup(&operation, alg));
@@ -2788,7 +2788,7 @@
sizeof(output), &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, one-shot */
PSA_ASSERT(psa_hash_compare(alg, input->x, input->len,
@@ -3393,7 +3393,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) {
@@ -3412,7 +3412,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;
@@ -3963,7 +3963,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));
@@ -3981,7 +3981,7 @@
&length));
output_length += length;
TEST_MEMORY_COMPARE(plaintext->x, plaintext->len,
- output, output_length);
+ output, output_length);
/* One-shot encryption */
output_length = ~0;
@@ -3989,7 +3989,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;
@@ -3997,7 +3997,7 @@
output, output_buffer_size,
&output_length));
TEST_MEMORY_COMPARE(plaintext->x, plaintext->len,
- output, output_length);
+ output, output_length);
exit:
PSA_ASSERT(psa_cipher_abort(&operation));
@@ -4117,7 +4117,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);
@@ -4216,7 +4216,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:
@@ -4316,7 +4316,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:
@@ -4473,7 +4473,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);
@@ -4765,7 +4765,7 @@
expected_result);
TEST_MEMORY_COMPARE(input_data->x, input_data->len,
- output_data2, output_length2);
+ output_data2, output_length2);
}
exit:
@@ -4832,7 +4832,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);
@@ -4905,7 +4905,7 @@
if (expected_result == PSA_SUCCESS) {
TEST_MEMORY_COMPARE(expected_data->x, expected_data->len,
- output_data, output_length);
+ output_data, output_length);
}
exit:
@@ -6492,7 +6492,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);
exit:
/*
@@ -6615,7 +6615,7 @@
/* Verify that the signature is what is expected. */
TEST_MEMORY_COMPARE(output_data->x, output_data->len,
- signature, signature_length);
+ signature, signature_length);
PSA_ASSERT(psa_sign_hash_abort(&operation));
@@ -7913,7 +7913,7 @@
&signature_length));
TEST_MEMORY_COMPARE(output_data->x, output_data->len,
- signature, signature_length);
+ signature, signature_length);
exit:
psa_reset_key_attributes(&attributes);
@@ -8251,7 +8251,7 @@
output2, output2_size,
&output2_length));
TEST_MEMORY_COMPARE(input_data->x, input_data->len,
- output2, output2_length);
+ output2, output2_length);
exit:
/*
@@ -8308,7 +8308,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. */
@@ -8324,7 +8324,7 @@
output_size,
&output_length));
TEST_MEMORY_COMPARE(expected_data->x, expected_data->len,
- output, output_length);
+ output, output_length);
}
exit:
@@ -8893,7 +8893,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];
@@ -9016,7 +9016,7 @@
TEST_EQUAL(status, expected_output_status);
if (expected_output->len != 0 && expected_output_status == PSA_SUCCESS) {
TEST_MEMORY_COMPARE(output_buffer, expected_output->len, expected_output->x,
- expected_output->len);
+ expected_output->len);
}
exit:
@@ -9168,7 +9168,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);
@@ -9229,7 +9229,7 @@
export_buffer, export_buffer_size,
&export_length));
TEST_MEMORY_COMPARE(export_buffer, export_length,
- expected_export->x, expected_export->len);
+ expected_export->x, expected_export->len);
exit:
mbedtls_free(export_buffer);
@@ -9379,7 +9379,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;
@@ -9391,7 +9391,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;
@@ -9487,7 +9487,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());
@@ -9514,13 +9514,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:
@@ -9834,7 +9834,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);
}
}
@@ -9861,7 +9861,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. */