Skip to content

Commit 9c49425

Browse files
gilles-peskine-armgilles-peskine-arm
committed
Update PSA test wrappers after framework update
``` framework/scripts/generate_psa_wrappers.py ``` Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
1 parent b1858b8 commit 9c49425

1 file changed

Lines changed: 0 additions & 92 deletions

File tree

‎tests/src/psa_test_wrappers.c‎

Lines changed: 0 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -714,15 +714,7 @@ psa_status_t mbedtls_test_wrap_psa_hash_compare(
714714
const uint8_t *arg3_hash,
715715
size_t arg4_hash_length)
716716
{
717-
#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)
718-
MBEDTLS_TEST_MEMORY_POISON(arg1_input, arg2_input_length);
719-
MBEDTLS_TEST_MEMORY_POISON(arg3_hash, arg4_hash_length);
720-
#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */
721717
psa_status_t status = (psa_hash_compare)(arg0_alg, arg1_input, arg2_input_length, arg3_hash, arg4_hash_length);
722-
#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)
723-
MBEDTLS_TEST_MEMORY_UNPOISON(arg1_input, arg2_input_length);
724-
MBEDTLS_TEST_MEMORY_UNPOISON(arg3_hash, arg4_hash_length);
725-
#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */
726718
return status;
727719
}
728720

@@ -735,15 +727,7 @@ psa_status_t mbedtls_test_wrap_psa_hash_compute(
735727
size_t arg4_hash_size,
736728
size_t *arg5_hash_length)
737729
{
738-
#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)
739-
MBEDTLS_TEST_MEMORY_POISON(arg1_input, arg2_input_length);
740-
MBEDTLS_TEST_MEMORY_POISON(arg3_hash, arg4_hash_size);
741-
#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */
742730
psa_status_t status = (psa_hash_compute)(arg0_alg, arg1_input, arg2_input_length, arg3_hash, arg4_hash_size, arg5_hash_length);
743-
#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)
744-
MBEDTLS_TEST_MEMORY_UNPOISON(arg1_input, arg2_input_length);
745-
MBEDTLS_TEST_MEMORY_UNPOISON(arg3_hash, arg4_hash_size);
746-
#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */
747731
return status;
748732
}
749733

@@ -754,13 +738,7 @@ psa_status_t mbedtls_test_wrap_psa_hash_finish(
754738
size_t arg2_hash_size,
755739
size_t *arg3_hash_length)
756740
{
757-
#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)
758-
MBEDTLS_TEST_MEMORY_POISON(arg1_hash, arg2_hash_size);
759-
#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */
760741
psa_status_t status = (psa_hash_finish)(arg0_operation, arg1_hash, arg2_hash_size, arg3_hash_length);
761-
#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)
762-
MBEDTLS_TEST_MEMORY_UNPOISON(arg1_hash, arg2_hash_size);
763-
#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */
764742
return status;
765743
}
766744

@@ -779,13 +757,7 @@ psa_status_t mbedtls_test_wrap_psa_hash_update(
779757
const uint8_t *arg1_input,
780758
size_t arg2_input_length)
781759
{
782-
#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)
783-
MBEDTLS_TEST_MEMORY_POISON(arg1_input, arg2_input_length);
784-
#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */
785760
psa_status_t status = (psa_hash_update)(arg0_operation, arg1_input, arg2_input_length);
786-
#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)
787-
MBEDTLS_TEST_MEMORY_UNPOISON(arg1_input, arg2_input_length);
788-
#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */
789761
return status;
790762
}
791763

@@ -795,13 +767,7 @@ psa_status_t mbedtls_test_wrap_psa_hash_verify(
795767
const uint8_t *arg1_hash,
796768
size_t arg2_hash_length)
797769
{
798-
#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)
799-
MBEDTLS_TEST_MEMORY_POISON(arg1_hash, arg2_hash_length);
800-
#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */
801770
psa_status_t status = (psa_hash_verify)(arg0_operation, arg1_hash, arg2_hash_length);
802-
#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)
803-
MBEDTLS_TEST_MEMORY_UNPOISON(arg1_hash, arg2_hash_length);
804-
#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */
805771
return status;
806772
}
807773

@@ -1030,15 +996,7 @@ psa_status_t mbedtls_test_wrap_psa_mac_compute(
1030996
size_t arg5_mac_size,
1031997
size_t *arg6_mac_length)
1032998
{
1033-
#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)
1034-
MBEDTLS_TEST_MEMORY_POISON(arg2_input, arg3_input_length);
1035-
MBEDTLS_TEST_MEMORY_POISON(arg4_mac, arg5_mac_size);
1036-
#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */
1037999
psa_status_t status = (psa_mac_compute)(arg0_key, arg1_alg, arg2_input, arg3_input_length, arg4_mac, arg5_mac_size, arg6_mac_length);
1038-
#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)
1039-
MBEDTLS_TEST_MEMORY_UNPOISON(arg2_input, arg3_input_length);
1040-
MBEDTLS_TEST_MEMORY_UNPOISON(arg4_mac, arg5_mac_size);
1041-
#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */
10421000
return status;
10431001
}
10441002

@@ -1049,13 +1007,7 @@ psa_status_t mbedtls_test_wrap_psa_mac_sign_finish(
10491007
size_t arg2_mac_size,
10501008
size_t *arg3_mac_length)
10511009
{
1052-
#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)
1053-
MBEDTLS_TEST_MEMORY_POISON(arg1_mac, arg2_mac_size);
1054-
#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */
10551010
psa_status_t status = (psa_mac_sign_finish)(arg0_operation, arg1_mac, arg2_mac_size, arg3_mac_length);
1056-
#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)
1057-
MBEDTLS_TEST_MEMORY_UNPOISON(arg1_mac, arg2_mac_size);
1058-
#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */
10591011
return status;
10601012
}
10611013

@@ -1075,13 +1027,7 @@ psa_status_t mbedtls_test_wrap_psa_mac_update(
10751027
const uint8_t *arg1_input,
10761028
size_t arg2_input_length)
10771029
{
1078-
#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)
1079-
MBEDTLS_TEST_MEMORY_POISON(arg1_input, arg2_input_length);
1080-
#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */
10811030
psa_status_t status = (psa_mac_update)(arg0_operation, arg1_input, arg2_input_length);
1082-
#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)
1083-
MBEDTLS_TEST_MEMORY_UNPOISON(arg1_input, arg2_input_length);
1084-
#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */
10851031
return status;
10861032
}
10871033

@@ -1094,15 +1040,7 @@ psa_status_t mbedtls_test_wrap_psa_mac_verify(
10941040
const uint8_t *arg4_mac,
10951041
size_t arg5_mac_length)
10961042
{
1097-
#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)
1098-
MBEDTLS_TEST_MEMORY_POISON(arg2_input, arg3_input_length);
1099-
MBEDTLS_TEST_MEMORY_POISON(arg4_mac, arg5_mac_length);
1100-
#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */
11011043
psa_status_t status = (psa_mac_verify)(arg0_key, arg1_alg, arg2_input, arg3_input_length, arg4_mac, arg5_mac_length);
1102-
#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)
1103-
MBEDTLS_TEST_MEMORY_UNPOISON(arg2_input, arg3_input_length);
1104-
MBEDTLS_TEST_MEMORY_UNPOISON(arg4_mac, arg5_mac_length);
1105-
#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */
11061044
return status;
11071045
}
11081046

@@ -1112,13 +1050,7 @@ psa_status_t mbedtls_test_wrap_psa_mac_verify_finish(
11121050
const uint8_t *arg1_mac,
11131051
size_t arg2_mac_length)
11141052
{
1115-
#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)
1116-
MBEDTLS_TEST_MEMORY_POISON(arg1_mac, arg2_mac_length);
1117-
#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */
11181053
psa_status_t status = (psa_mac_verify_finish)(arg0_operation, arg1_mac, arg2_mac_length);
1119-
#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)
1120-
MBEDTLS_TEST_MEMORY_UNPOISON(arg1_mac, arg2_mac_length);
1121-
#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */
11221054
return status;
11231055
}
11241056

@@ -1286,13 +1218,7 @@ psa_status_t mbedtls_test_wrap_psa_random_reseed(
12861218
const uint8_t *arg0_perso,
12871219
size_t arg1_perso_size)
12881220
{
1289-
#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)
1290-
MBEDTLS_TEST_MEMORY_POISON(arg0_perso, arg1_perso_size);
1291-
#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */
12921221
psa_status_t status = (psa_random_reseed)(arg0_perso, arg1_perso_size);
1293-
#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)
1294-
MBEDTLS_TEST_MEMORY_UNPOISON(arg0_perso, arg1_perso_size);
1295-
#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */
12961222
return status;
12971223
}
12981224

@@ -1507,13 +1433,7 @@ psa_status_t mbedtls_test_wrap_psa_xof_output(
15071433
uint8_t *arg1_output,
15081434
size_t arg2_output_length)
15091435
{
1510-
#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)
1511-
MBEDTLS_TEST_MEMORY_POISON(arg1_output, arg2_output_length);
1512-
#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */
15131436
psa_status_t status = (psa_xof_output)(arg0_operation, arg1_output, arg2_output_length);
1514-
#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)
1515-
MBEDTLS_TEST_MEMORY_UNPOISON(arg1_output, arg2_output_length);
1516-
#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */
15171437
return status;
15181438
}
15191439

@@ -1523,13 +1443,7 @@ psa_status_t mbedtls_test_wrap_psa_xof_set_context(
15231443
const uint8_t *arg1_context,
15241444
size_t arg2_context_length)
15251445
{
1526-
#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)
1527-
MBEDTLS_TEST_MEMORY_POISON(arg1_context, arg2_context_length);
1528-
#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */
15291446
psa_status_t status = (psa_xof_set_context)(arg0_operation, arg1_context, arg2_context_length);
1530-
#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)
1531-
MBEDTLS_TEST_MEMORY_UNPOISON(arg1_context, arg2_context_length);
1532-
#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */
15331447
return status;
15341448
}
15351449

@@ -1548,13 +1462,7 @@ psa_status_t mbedtls_test_wrap_psa_xof_update(
15481462
const uint8_t *arg1_input,
15491463
size_t arg2_input_length)
15501464
{
1551-
#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)
1552-
MBEDTLS_TEST_MEMORY_POISON(arg1_input, arg2_input_length);
1553-
#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */
15541465
psa_status_t status = (psa_xof_update)(arg0_operation, arg1_input, arg2_input_length);
1555-
#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)
1556-
MBEDTLS_TEST_MEMORY_UNPOISON(arg1_input, arg2_input_length);
1557-
#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */
15581466
return status;
15591467
}
15601468

0 commit comments

Comments
 (0)