cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-09-09 23:26:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1175 from davidhorstmann-arm/cipher-multipart-test-fix-backport

Browse Source 
[Backport 2.28] Fix a multipart test that overwrites the same buffer twice
This commit is contained in:
David Horstmann 2024-02-07 17:18:52 +00:00 committed by GitHub
commit 4fc2b9b80f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/suites/test_suite_psa_crypto.data
View File

@ -1971,6 +1971,11 @@ PSA symmetric encrypt/decrypt multipart: AES-CBC-nopad, 16 bytes, good
depends_on:PSA_WANT_ALG_CBC_NO_PADDING:PSA_WANT_KEY_TYPE_AES depends_on:PSA_WANT_ALG_CBC_NO_PADDING:PSA_WANT_KEY_TYPE_AES
cipher_verify_output_multipart:PSA_ALG_CBC_NO_PADDING:PSA_KEY_TYPE_AES:"2b7e151628aed2a6abf7158809cf4f3c":"6bc1bee22e409f96e93d7e117393172a":16 cipher_verify_output_multipart:PSA_ALG_CBC_NO_PADDING:PSA_KEY_TYPE_AES:"2b7e151628aed2a6abf7158809cf4f3c":"6bc1bee22e409f96e93d7e117393172a":16
# Encrypt 48 bytes total, initially 16. This forces both calls to update() to output data.
PSA symmetric encrypt/decrypt multipart: AES-CBC-nopad, 48 bytes, good
depends_on:PSA_WANT_ALG_CBC_NO_PADDING:PSA_WANT_KEY_TYPE_AES
cipher_verify_output_multipart:PSA_ALG_CBC_NO_PADDING:PSA_KEY_TYPE_AES:"2b7e151628aed2a6abf7158809cf4f3c":"6bc1bee22e409f96e93d7e117393172a6bc1bee22e409f96e93d7e117393172a6bc1bee22e409f96e93d7e117393172a":16
PSA symmetric encrypt/decrypt multipart: AES-CBC-PKCS#7, 16 bytes PSA symmetric encrypt/decrypt multipart: AES-CBC-PKCS#7, 16 bytes
depends_on:PSA_WANT_ALG_CBC_PKCS7:PSA_WANT_KEY_TYPE_AES depends_on:PSA_WANT_ALG_CBC_PKCS7:PSA_WANT_KEY_TYPE_AES
cipher_verify_output_multipart:PSA_ALG_CBC_PKCS7:PSA_KEY_TYPE_AES:"2b7e151628aed2a6abf7158809cf4f3c":"6bc1bee22e409f96e93d7e117393172a":16 cipher_verify_output_multipart:PSA_ALG_CBC_PKCS7:PSA_KEY_TYPE_AES:"2b7e151628aed2a6abf7158809cf4f3c":"6bc1bee22e409f96e93d7e117393172a":16

6
tests/suites/test_suite_psa_crypto.function
View File

@ -3291,7 +3291,8 @@ void cipher_verify_output_multipart(int alg_arg,
PSA_ASSERT(psa_cipher_update(&operation1, PSA_ASSERT(psa_cipher_update(&operation1,
input->x + first_part_size, input->x + first_part_size,
input->len - first_part_size, input->len - first_part_size,
output1, output1_buffer_size, output1 + output1_length,
output1_buffer_size - output1_length,
&function_output_length)); &function_output_length));
TEST_LE_U(function_output_length, TEST_LE_U(function_output_length,
PSA_CIPHER_UPDATE_OUTPUT_SIZE(key_type, PSA_CIPHER_UPDATE_OUTPUT_SIZE(key_type,
@ -3337,7 +3338,8 @@ void cipher_verify_output_multipart(int alg_arg,
PSA_ASSERT(psa_cipher_update(&operation2, PSA_ASSERT(psa_cipher_update(&operation2,
output1 + first_part_size, output1 + first_part_size,
output1_length - first_part_size, output1_length - first_part_size,
output2, output2_buffer_size, output2 + output2_length,
output2_buffer_size - output2_length,
&function_output_length)); &function_output_length));
TEST_LE_U(function_output_length, TEST_LE_U(function_output_length,
PSA_CIPHER_UPDATE_OUTPUT_SIZE(key_type, PSA_CIPHER_UPDATE_OUTPUT_SIZE(key_type,