mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-02-22 18:39:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
28,607 Commits 172 Branches 263 Tags
Commit Graph

5905 Commits

Author SHA1 Message Date
David Horstmann
433a58c170 Fix magic numbers in more J-PAKE tests 
In the ecjpake_do_round(), fix a magic number that was causing buffer
size to be incorrectly advertised.

Followup of 'Fix magic number buffer length in J-PAKE tests' for what
seem to be duplicate tests.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
 2024-01-25 16:29:26 +00:00
David Horstmann
fdedbb78a5 Fix magic number buffer length in J-PAKE tests 
The buffer size was advertised as 512-bytes, despite sometimes being
smaller. This did not cause a crash until buffer copying, which always
copies all of the buffer, was added.

When copying back to the original, we would cause a heap buffer
overflow, which ASan detected.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
 2024-01-24 15:42:11 +00:00
David Horstmann
7de0928fd1 Move wrapper include to psa_crypto_helpers.h 
This makes memory poisoning wrappers available to (almost) all tests.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
 2023-12-14 16:09:07 +00:00
David Horstmann
410823730b Remove write check in driver wrappers tests 
This check is intended to ensure that we do not write intermediate
results to the shared output buffer. This check will be made obselete
by generic memory-poisoning-based testing for all functions.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
 2023-12-11 17:58:56 +00:00
David Horstmann
8f35a4f003 Create memory poisoning wrapper for cipher encrypt 
Use the preprocessor to wrap psa_cipher_encrypt in a wrapper that
poisons the input and output buffers.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
 2023-12-11 17:58:56 +00:00
David Horstmann
38e4e9c499 Add explicit UNPOISON calls to memory tests 
These are needed to allow them to operate on buffer copies without
triggering ASan use-after-poison detection.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
 2023-12-11 17:58:56 +00:00
Gilles Peskine
479a1944e8 Basic functional test for memory poisoning 
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2023-11-29 19:22:03 +01:00
Gilles Peskine
0457559323 Merge remote-tracking branch 'development' into development-restricted 2023-11-29 19:21:19 +01:00
Janos Follath
c6f1637f8c
Merge pull request #8534 from paul-elliott-arm/fix_mutex_abstraction 
Make mutex abstraction and tests thread safe
 2023-11-29 13:26:23 +00:00
Dave Rodgman
c3cd410acf
Merge pull request #8286 from gilles-peskine-arm/check_mbedtls_calloc_overallocation-disable_with_asan 
Fix test_suite_platform failure with Asan on modern Clang
 2023-11-28 16:48:31 +00:00
Pengyu Lv
6c927c0795 Merge branch 'development' into review/gilles/update-old-dep-MD_CAN 2023-11-28 09:31:44 +08:00
Dave Rodgman
c7cc83cc44
Merge pull request #1119 from davidhorstmann-arm/psa-buffer-copy-fn 
Implement buffer copying functions for PSA crypto
 2023-11-24 10:46:38 +00:00
Paul Elliott
f25d831123 Ensure mutex test mutex gets free'd 
Signed-off-by: Paul Elliott <paul.elliott@arm.com>
 2023-11-23 18:49:43 +00:00
Dave Rodgman
8cd4bc4ac2
Merge pull request #8124 from yanrayw/support_cipher_encrypt_only 
Support the negative option MBEDTLS_BLOCK_CIPHER_NO_DECRYPT
 2023-11-23 17:43:00 +00:00
Dave Rodgman
c44042ddbc
Merge pull request #7905 from lpy4105/issue/misc-improvement 
misc improvements
 2023-11-23 16:20:58 +00:00
Yanray Wang
690ee81533 Merge remote-tracking branch 'origin/development' into support_cipher_encrypt_only 2023-11-23 10:31:26 +08:00
Gilles Peskine
3b2b7f8acf MSan and TSan complain as well, not just ASan 
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2023-11-22 18:08:17 +01:00
Gilles Peskine
05ebe967be Disable check_mbedtls_calloc overallocation under ASan 
This test case exercises an integer overflow in calloc. Under Asan, with
a modern Clang, this triggers an Asan complaint. The complaint can be
avoided with ASAN_OPTIONS=allocator_may_return_null=1, but this has to
be set in the environment before the program starts, and could hide
other errors.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2023-11-22 17:56:26 +01:00
Jerry Yu
aa5dc24df9 Change if to switch case 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2023-11-21 09:59:25 +08:00
Jerry Yu
713ce1f889 various improvement 
- improve change log entry
- improve comments
- remove unnecessary statement
- change type of client_age

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2023-11-21 09:59:25 +08:00
Jerry Yu
4ac648ef20 improve readability 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2023-11-21 09:59:24 +08:00
Jerry Yu
d84c14f80c improve code style 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2023-11-21 09:59:24 +08:00
Jerry Yu
b2455d2472 Guards ticket_creation_time 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2023-11-21 09:59:24 +08:00
Jerry Yu
342a555eef rename ticket received 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2023-11-21 09:58:19 +08:00
Jerry Yu
25ba4d40ef rename ticket_creation to ticket_creation_time 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2023-11-21 09:58:19 +08:00
Jerry Yu
28547c49ed update tests 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2023-11-21 09:58:18 +08:00
David Horstmann
89875a4f20 Rename "output_copy" -> "local_output" 
This helps to prevent confusion as it avoids overloading the word
"copy" as both an action and an object.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
 2023-11-20 17:55:13 +00:00
David Horstmann
f1734054fa Rename "input_copy" -> "local_input" 
This helps to prevent confusion as it avoids overloading the word
"copy" as both an action and an object.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
 2023-11-20 17:54:57 +00:00
David Horstmann
2f307b4216 De-abbreviate "len" -> "length" 
Signed-off-by: David Horstmann <david.horstmann@arm.com>
 2023-11-20 13:04:06 +00:00
David Horstmann
671f5f539e Change psa_crypto_copy_output error code 
When we are copying output, it makes sense to return
PSA_ERROR_BUFFER_TOO_SMALL since the buffer we are copying to is a user
output buffer.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
 2023-11-20 13:03:43 +00:00
David Horstmann
9abf535078 Add initializers for input / output copies 
Signed-off-by: David Horstmann <david.horstmann@arm.com>
 2023-11-20 12:29:54 +00:00
Ronald Cron
97137f91b6
Merge pull request #7071 from yuhaoth/pr/tls13-ticket-add-max_early_data_size-field 
TLS 1.3 EarlyData: add `max_early_data_size` field for ticket
 2023-11-20 08:04:57 +00:00
David Horstmann
365df3f16c Remove unnecessary checks for NULL-ness of copies 
Signed-off-by: David Horstmann <david.horstmann@arm.com>
 2023-11-16 20:30:36 +00:00
David Horstmann
58909704e3 Check for len == 0 rather than buffer == NULL 
This makes the intention clearer

Signed-off-by: David Horstmann <david.horstmann@arm.com>
 2023-11-16 20:26:16 +00:00
David Horstmann
0fca150b81 Compare buffers even for zero-length cases 
This enables us to test that lengths are correctly zero when the buffer
pointer is NULL.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
 2023-11-16 20:12:17 +00:00
David Horstmann
23f1122838 Use TEST_CALLOC_NONNULL 
Check that input/output copying works for zero-length NULL input
buffers.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
 2023-11-16 20:01:32 +00:00
David Horstmann
b4e3f36918 Change data pattern to simpler one 
Just use the index modulo 256, as this has a greater stride and is
simpler to use.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
 2023-11-16 19:57:25 +00:00
Pengyu Lv
c5d4c46983 Add missing PSA init 
EC might be supported through PSA, so use `MD_OR_USE_PSA_INIT`
in pk_parse_{public_}keyfile_ec.

Signed-off-by: Pengyu Lv <pengyu.lv@arm.com>
 2023-11-16 09:07:28 +08:00
David Horstmann
1b7279a849 Make copy functions static-testable 
This allows greater compiler optimisation.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
 2023-11-15 17:26:18 +00:00
Manuel Pégourié-Gonnard
dc848955d6
Merge pull request #8519 from mpg/block-cipher 
[G2] Add internal module block_cipher
 2023-11-15 11:53:22 +00:00
Gilles Peskine
4ebccc0396 Update PSA init for md-ligt 
Also initialize PSA in builds where hashes are PSA-only, for the sake of
encrypted keys (otherwise PBKDF fails).

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2023-11-15 11:04:30 +01:00
Gilles Peskine
799befd58e Update to TEST_EQUAL macros for easier debuggability 
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2023-11-15 11:04:23 +01:00
Manuel Pégourié-Gonnard
9e80a91f27
Merge pull request #8164 from yanrayw/adjust_tfm_configs 
Adjust how we handle TF-M config files
 2023-11-15 08:21:27 +00:00
Manuel Pégourié-Gonnard
cf582df426
Merge pull request #8498 from mpg/legacy-deps-psa-tests 
Remove legacy dependencies from PSA tests
 2023-11-13 08:16:30 +00:00
Manuel Pégourié-Gonnard
76fa16cab3 block_cipher: add encrypt() 
Test data copied from existing test suites.

Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>
 2023-11-10 12:14:53 +01:00
Manuel Pégourié-Gonnard
3e0884fc53 block_cipher: add setkey() 
Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>
 2023-11-10 11:52:10 +01:00
Manuel Pégourié-Gonnard
21718769d1 Start adding internal module block_cipher.c 
Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>
 2023-11-10 11:21:17 +01:00
Manuel Pégourié-Gonnard
7d7ce0e66a
Merge pull request #8495 from lpy4105/issue/6322/driver-only-cipher_aead-tls 
[G3] Driver-only cipher+aead: TLS: main test suite
 2023-11-09 11:10:34 +00:00
David Horstmann
0a57ed25c4 Add output round-trip testcase 
Signed-off-by: David Horstmann <david.horstmann@arm.com>
 2023-11-08 18:18:14 +00:00
David Horstmann
35dd103688 Add input round-trip testcase 
Signed-off-by: David Horstmann <david.horstmann@arm.com>
 2023-11-08 18:17:58 +00:00