ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-05-12 18:04:39 +08:00
Code Issues Releases Wiki Activity
33,202 Commits 173 Branches 267 Tags
Commit Graph

12367 Commits

Author SHA1 Message Date
Gilles Peskine
b8457fff9f
Merge pull request #9353 from eleuzi01/replace-ecp-have-secp384r1 
Replace MBEDTLS_ECP_HAVE_SECP384R1 with PSA_WANT_ECC_SECP_R1_384
 2024-08-12 14:37:10 +00:00
Gilles Peskine
0858fdca38
Merge pull request #9189 from misch7/fix-v3.6-issues-9186-and-9188 
Fix build of v3.6 (issues #9186 and #9188)
 2024-08-12 09:34:17 +00:00
Bence Szépkúti
88f3dd9f78
Merge pull request #9402 from tom-daubney-arm/remove_function_level_alt_interface 
Remove function level alt interface
 2024-08-09 17:59:51 +00:00
Gilles Peskine
a9dda7e3d0 Add test components with the PSA static key store 
We were only testing the static key store (MBEDTLS_PSA_KEY_STORE_DYNAMIC
disabled) with configs/*.h. Add a component with the static key store and
everything else (including built-in keys), and a component with the static
key store and CTR_DBRG using PSA for AES (which means PSA uses a volatile
key internally).

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2024-08-09 15:41:11 +02:00
Michael Schuster
c1cd26b20f Revert commit 33af72df in order to not depend on test code 
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2024-08-09 10:29:59 +01:00
Michael Schuster
0aaa493d84 Add missing include in tests/src/psa_memory_poisoning_wrappers.c to fix missing-prototype error 
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2024-08-09 10:29:59 +01:00
Michael Schuster
f828f04532 Fix Uncrustify errors in modified tests/suites to satisfy check_code_style test 
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2024-08-09 10:29:59 +01:00
Michael Schuster
a3cc46382b Use correct test case conditionals for helper functions in tests/suites 
Fix unused-function errors.

Signed-off-by: Michael Schuster <michael@schuster.ms>
 2024-08-09 10:29:59 +01:00
Michael Schuster
8f606551d7 Fix tests build with MBEDTLS_PSA_CRYPTO_BUILTIN_KEYS enabled 
In that case mbedtls_psa_platform_get_builtin_key is already declared.

Signed-off-by: Michael Schuster <michael@schuster.ms>
 2024-08-09 10:29:58 +01:00
Michael Schuster
bd89b791a4 Adjust spacing in tests/suites function sources 
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2024-08-09 10:29:58 +01:00
Michael Schuster
54300d4a4e Fix missing-prototype errors in tests/suites 
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2024-08-09 10:29:58 +01:00
Michael Schuster
4595e6872d Move print_buf into mbedtls_test_print_buf helper function in sample programs 
Reduce code duplication and fix missing-prototype error for print_buf

Signed-off-by: Michael Schuster <michael@schuster.ms>
 2024-08-09 10:29:58 +01:00
Michael Schuster
2b87afbd1f Add missing include in tests/src/asn1_helpers.c 
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2024-08-09 10:29:58 +01:00
Minos Galanakis
a368c8a9af Add -Wmissing-prototypes to component_build_no_ssl_srv and component_build_no_ssl_cli in all.sh 
Signed-off-by: Michael Schuster <michael@schuster.ms>
Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>
 2024-08-09 10:29:58 +01:00
Elena Uziunaite
6b4cd48d24 Replace MBEDTLS_ECP_HAVE_SECP384R1 with PSA_WANT_ECC_SECP_R1_384 
Signed-off-by: Elena Uziunaite <elena.uziunaite@arm.com>
 2024-08-09 09:49:03 +01:00
Gilles Peskine
aacbc622a4
Merge pull request #9453 from gilles-peskine-arm/psa-keystore-dynamic-prep-4.0 
Prepare for dynamic key store
 2024-08-09 08:00:06 +00:00
Gilles Peskine
e1171bd26f
Merge pull request #9361 from eleuzi01/replace-key-aria 
Replace MBEDTLS_SSL_HAVE_ARIA with PSA_WANT_KEY_TYPE_ARIA
 2024-08-08 15:41:01 +00:00
Tom Cosgrove
f35bb312c9
Merge pull request #9459 from gilles-peskine-arm/make-tests-make-3.81-20240808 
Be compatible with GNU Make 3.81
 2024-08-08 14:19:56 +00:00
Gilles Peskine
fe8fc7515f PSA_DONE: account for MBEDTLS_TEST_PSA_INTERNAL_KEYS 
Replace the hard-coded 1 by the proper constant now that the proper constant
exists.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2024-08-08 15:58:31 +02:00
Minos Galanakis
123a625386 Resolved merge conflicts caused by file moved in #8226 
Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>
 2024-08-08 14:11:53 +01:00
Gilles Peskine
9e54a4f5ba
Merge pull request #9369 from eleuzi01/replace-ecc-keys 
Replace MBEDTLS_PK_HAVE_ECC_KEYS with PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
 2024-08-08 12:10:43 +00:00
Gilles Peskine
88a6baaaaa Be compatible with GNU Make 3.81 
GNU Make 3.81 is officially not supported (we require >= 3.82), but be nice
to XCode users who are stuck with 3.81.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2024-08-08 14:07:24 +02:00
Tom Cosgrove
195e1647b2
Merge pull request #9427 from valeriosetti/psasim-small-fixes 
psasim: small fixes to all.sh and test bash scripts
 2024-08-07 13:13:46 +00:00
Gilles Peskine
35f057330f Keep track of PSA keys used interally 
When PSA uses CTR_DRBG for its random generator and CTR_DRBG uses PSA for
AES, as currently implemented, there is one volatile key in permanent use
for the CTR_DRBG instance. Account for that in tests that want to know
exactly how many volatile keys are in use, or how many volatile keys can be
created.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2024-08-07 12:39:05 +02:00
Gilles Peskine
0e3704f0a0 Reorder blocks to avoid double negations 
Convert `#if !... A #else B #endif` to `#if ... B #else A`. No semantic change.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2024-08-07 12:39:05 +02:00
Gilles Peskine
bdd16d4cb1 Make it possible to enable CTR_DRBG/PSA without a PSA AES driver 
Make it possible, but not officially supported, to switch the CTR_DRBG
module to PSA mode even if MBEDTLS_AES_C is defined. This is not really
useful in practice, but is convenient to test the PSA mode without setting
up drivers.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2024-08-07 12:39:05 +02:00
Elena Uziunaite
51c85a0296 Replace MBEDTLS_SSL_HAVE_ARIA with PSA_WANT_KEY_TYPE_ARIA 
Signed-off-by: Elena Uziunaite <elena.uziunaite@arm.com>
 2024-08-07 11:33:14 +01:00
Manuel Pégourié-Gonnard
821b908456
Merge pull request #9364 from eleuzi01/replace-ccm 
Replace MBEDTLS_SSL_HAVE_CCM with PSA_WANT_ALG_CCM
 2024-08-07 08:18:52 +00:00
Tom Cosgrove
2d5b17be03
Merge pull request #8609 from tom-daubney-arm/standardise_proj_detection 
Standardise Project Detection in Shell Scripts
 2024-08-07 07:18:36 +00:00
Thomas Daubney
b55679736b Move some proj detection code inside pre_check_environment 
Signed-off-by: Thomas Daubney <thomas.daubney@arm.com>
 2024-08-06 17:35:38 +01:00
Thomas Daubney
7c0b4adfa2 Remove MBEDTLS_AES_DECRYPT_ALT 
Signed-off-by: Thomas Daubney <thomas.daubney@arm.com>
 2024-08-06 15:20:03 +01:00
Thomas Daubney
6cf05f9322 Remove MBEDTLS_AES_ENCRYPT_ALT 
Signed-off-by: Thomas Daubney <thomas.daubney@arm.com>
 2024-08-06 15:15:51 +01:00
Thomas Daubney
955ce58142 Remove MBEDTLS_AES_SETKEY_DEC_ALT 
Signed-off-by: Thomas Daubney <thomas.daubney@arm.com>
 2024-08-06 15:15:08 +01:00
Thomas Daubney
742a2e3619 Remove MBEDTLS_AES_SETKEY_ENC_ALT 
Signed-off-by: Thomas Daubney <thomas.daubney@arm.com>
 2024-08-06 15:09:16 +01:00
Valerio Setti
2016d66741 psasim: small fixes to all.sh and test bash scripts 
Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
 2024-08-06 11:52:00 +02:00
Elena Uziunaite
3e81411122 Remove test_valgrind_constant_flow_psa_no_asm 
+ typo fix

Signed-off-by: Elena Uziunaite <elena.uziunaite@arm.com>
 2024-08-05 15:55:44 +01:00
Elena Uziunaite
65d102673c Remove the hack in library/constant_time_impl.h 
Signed-off-by: Elena Uziunaite <elena.uziunaite@arm.com>
 2024-08-05 15:54:58 +01:00
Elena Uziunaite
61dabbd77b Edit component_release_test_valgrind_constant_flow_no_asm 
Signed-off-by: Elena Uziunaite <elena.uziunaite@arm.com>
 2024-08-05 15:53:42 +01:00
Elena Uziunaite
aff61f35f7 Change valgrind constant flow testing to test without asm 
Signed-off-by: Elena Uziunaite <elena.uziunaite@arm.com>
 2024-08-05 15:52:38 +01:00
Elena Uziunaite
dcb5d83d66 Disable asm in component_test_memsan 
Signed-off-by: Elena Uziunaite <elena.uziunaite@arm.com>
 2024-08-05 15:50:57 +01:00
Elena Uziunaite
969e9e1af0 Alter constant-flow memsan testing 
Disable asm in memsan constant-flow testing and add a check in
check_config.h

Signed-off-by: Elena Uziunaite <elena.uziunaite@arm.com>
 2024-08-05 15:48:19 +01:00
Elena Uziunaite
8dde3b3dec Replace MBEDTLS_PK_HAVE_ECC_KEYS with PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY 
Signed-off-by: Elena Uziunaite <elena.uziunaite@arm.com>
 2024-08-05 15:41:58 +01:00
Elena Uziunaite
c256172b30 Replace MBEDTLS_SSL_HAVE_CCM with PSA_WANT_ALG_CCM 
Signed-off-by: Elena Uziunaite <elena.uziunaite@arm.com>
 2024-08-05 15:40:00 +01:00
Gilles Peskine
59aea4e1cc armv8 AES, SHA: simplify structure and fix copypasta 
Reorganize the structure of the builds of aesce.c and sha256ce.c with
various configurations of AES/SHA256 acceleration. Now everything in a given
configuration is grouped together (building the object file, and checking
the presence or absence of certain instructions in the assembly).

Fix several instances of copypasta in -m options where we were sometimes not
allowing the compiler to use optional instructions even though we use them
in inline assembly, and sometimes allowing the compiler to use optional
instructions even though we then checked their absence

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2024-08-05 16:11:34 +02:00
Gilles Peskine
8bea95de00 Use .s extension for assembly 
Having assembly files called *.o was confusing.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2024-08-05 16:10:57 +02:00
Gilles Peskine
20de806b8d Use -O2 for build+test with earliest compilers 
The compilation is slower but we get more potential warnings and running the
tests is faster.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2024-08-05 16:07:15 +02:00
Gilles Peskine
29e86ca059 Fix spurious * in regex 
`grep mbedtls_des*` would pick up e.g. mbedtls_derive_xxx.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2024-08-05 16:05:31 +02:00
Gilles Peskine
d860f28b29 Don't set LD to a path with a typo for mingw 
Our makefiles don't use $(LD) so the typo was harmless.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2024-08-05 16:03:20 +02:00
Gilles Peskine
7db1bcdb34 Update generated PSA wrappers 
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2024-08-05 15:52:37 +02:00
Gilles Peskine
fd46f7f173 Migrate psasim wrappers to psa_custom_key_parameters_t 
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2024-08-05 15:52:37 +02:00