17866 Commits

Author SHA1 Message Date
David Horstmann
63b06a8889 Add ChangeLog entry for CMake config defines
Signed-off-by: David Horstmann <david.horstmann@arm.com>
2023-07-07 11:29:23 +01:00
David Horstmann
58dda6713c Use emptiness-checks rather than DEFINED checks
For the MBEDTLS_CONFIG_FILE and MBEDTLS_USER_CONFIG_FILE variables,
check that they are non-empty and defined. This means they can be
unconditionally created in the cache, simplifying the CMakeLists.txt

Signed-off-by: David Horstmann <david.horstmann@arm.com>
2023-07-05 18:12:09 +01:00
David Horstmann
6762231e4b Use CONFIG_H variable rather than config file name
Signed-off-by: David Horstmann <david.horstmann@arm.com>
2023-07-05 14:35:25 +01:00
David Horstmann
175afbdfe8 all.sh component to test cmake custom config file
Signed-off-by: David Horstmann <david.horstmann@arm.com>
2023-07-05 14:35:25 +01:00
David Horstmann
1a30cf70cc Pass config file options to mbedtls_test(_helpers)
Signed-off-by: David Horstmann <david.horstmann@arm.com>
2023-07-05 14:35:08 +01:00
David Horstmann
e31e287109 Pass MBEDTLS_CONFIG_FILE defines through cmake
When -DMBEDTLS_CONFIG_FILE or -DMBEDTLS_USER_CONFIG_FILE are passed to
cmake, pass them through as compile definitions. This allows different
mbedtls configs to be passed at configure time without modifying any
cmake files.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
2023-07-05 14:33:11 +01:00
Dave Rodgman
09f198da19
Merge pull request #7876 from gilles-peskine-arm/code-style-since-2.28
Backport 2.28: code_style.py --since
2023-07-05 10:55:53 +01:00
Gilles Peskine
7b780491f0 Handle deleted files correctly
Don't attempt to run on a file that isn't present now.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
2023-07-04 15:47:02 +02:00
Gilles Peskine
8ceeba4f22 Add --since option to check files modified since a given commit
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
2023-07-04 15:47:01 +02:00
Gilles Peskine
0f1053c13b Clean up subprocess invocation in get_src_files
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
2023-07-04 15:46:59 +02:00
Dave Rodgman
08efc3d768
Merge pull request #7854 from daverodgman/fix-unused-aes-2.28
Fix AES dependencies - build TF-M config cleanly - backport 2.28
2023-07-03 16:48:39 +01:00
Dave Rodgman
a3fc295559
Merge pull request #7823 from SlugFiller/mbedtls-2.28
Support compilation using CLang on Windows
2023-07-03 09:52:03 +01:00
Tom Cosgrove
fbcb5d469b
Merge pull request #7850 from davidhorstmann-arm/2.28-fix-string-to-names-retcode
[Backport 2.28] Fix false success return code in `mbedtls_x509_string_to_names()`
2023-06-30 14:28:38 +01:00
Dave Rodgman
3fb807c064
Merge pull request #7761 from waleed-elmelegy-arm/crypt_and_hash-decrypt-fix_backport
Backport 2.28: Fix crypt_and_hash decrypt issue when used with stream cipher
2023-06-30 11:42:19 +01:00
Dave Rodgman
f72b8375d0 Fix order of endif comments
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
2023-06-29 16:33:03 +01:00
Dave Rodgman
bf99828d7b Nicer formatting
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
2023-06-29 12:14:41 +01:00
Dave Rodgman
173227d41e Test combinations of macros for aes.o
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
2023-06-29 12:14:34 +01:00
Dave Rodgman
1d0033e1ac Improve #endif comments
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
2023-06-29 12:13:26 +01:00
Dave Rodgman
1ce92e4887 Correct #endif comments
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
2023-06-29 12:13:15 +01:00
Dave Rodgman
a4a337360d Correct comments on #endif's
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
2023-06-29 12:13:08 +01:00
Dave Rodgman
94210b13eb Compile fixes
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
2023-06-28 14:08:07 +01:00
Dave Rodgman
bae79fa16e Add missing sha header includes to entropy.c
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
2023-06-28 11:54:53 +01:00
Dave Rodgman
1262315a1a Fix warnings re: unused variables in pkparse and pkwrite
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
2023-06-28 11:54:25 +01:00
Dave Rodgman
f488c2ca79 Add missing include for INT_MAX definition
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
2023-06-28 11:35:25 +01:00
Dave Rodgman
c62e5c4885 Update changelog for 2.28
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
2023-06-28 11:33:07 +01:00
Dave Rodgman
c34bea20d6 fix trailing whitespace
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
2023-06-28 11:31:57 +01:00
Dave Rodgman
aac022dab4 Changelog
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
2023-06-28 11:31:53 +01:00
Dave Rodgman
584b62f89e code style
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
2023-06-28 11:31:29 +01:00
Dave Rodgman
9d3b63396b Fix comment
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
2023-06-28 11:31:29 +01:00
Dave Rodgman
5c047d9672 More dependency fixes
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
2023-06-28 11:31:29 +01:00
Dave Rodgman
36c8e581d6 Fix unused variable
Fix when MBEDTLS_AES_SETKEY_ENC_ALT, MBEDTLS_AES_DECRYPT_ALT and
MBEDTLS_AES_ROM_TABLE set.

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
2023-06-28 11:31:29 +01:00
Dave Rodgman
dbae184ceb Fix unused variable if MBEDTLS_AES_SETKEY_ENC_ALT and MBEDTLS_AES_DECRYPT_ALT set
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
2023-06-28 11:31:29 +01:00
Dave Rodgman
9b20aeaa17 Fix unused fn when MBEDTLS_AES_SETKEY_DEC_ALT and MBEDTLS_AES_SETKEY_ENC_ALT set
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
2023-06-28 11:31:29 +01:00
Dave Rodgman
1e6f7708f2 Fix unused function when MBEDTLS_AES_SETKEY_ENC_ALT set
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
2023-06-28 11:31:29 +01:00
David Horstmann
1e8086bd21 Add ChangeLog entry for string_to_names() fix
Signed-off-by: David Horstmann <david.horstmann@arm.com>
2023-06-27 17:34:58 +01:00
David Horstmann
5c019e0f65 Add regression testcase for string_to_names()
Test against a string with no '=' or ',' in it, which previously caused
mbedtls_x509_string_to_names() to return 0.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
2023-06-27 17:34:58 +01:00
David Horstmann
abaea614d2 Return an error when no name is parsed
When less than 1 RDN is successfully parsed in
mbedtls_x509_string_to_names(), return an error. Previously this
returned success when a string containing neither '=' or ',' was
supplied.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
2023-06-27 17:34:58 +01:00
Waleed Elmelegy
6a4af481e1 Replace struct access with local variable
Replace struct access with local variable to minimize
differnces with development branch.

Signed-off-by: Waleed Elmelegy <waleed.elmelegy@arm.com>
2023-06-27 14:07:57 +01:00
SlugFiller
e2d0614571 Support compilation using CLang on Windows
Signed-off-by: SlugFiller <5435495+SlugFiller@users.noreply.github.com>
2023-06-26 19:19:56 +03:00
Gilles Peskine
63b50b56cd
Merge pull request #7753 from lpy4105/backport-2.28/issue/renew_cert_2024-01-01
Backport 2.28: Updating crt/crl files due to expiry before 2024-01-01
2023-06-21 12:29:12 +02:00
Bence Szépkúti
e0dcd18a23
Merge pull request #7721 from DemiMarie/do-while-2.28
[Backport 2.28] Add a do-while loop around a macro
2023-06-21 11:31:48 +02:00
Manuel Pégourié-Gonnard
001a052e0f
Merge pull request #7712 from DemiMarie/backport-test-fix
Backport 2.28: x509parse tests: Replace TEST_ASSERT with TEST_EQUAL
2023-06-21 11:02:28 +02:00
Demi Marie Obenour
0e2074133a Add a do-while loop around macros
This is good practice in C.

Signed-off-by: Demi Marie Obenour <demiobenour@gmail.com>
2023-06-20 11:45:26 -04:00
Demi Marie Obenour
5d7cd012ac x509parse tests: Replace TEST_ASSERT with TEST_EQUAL
The latter gives much more informative errors.

Signed-off-by: Demi Marie Obenour <demiobenour@gmail.com>
2023-06-19 11:04:47 -04:00
Gilles Peskine
cc51e8a615
Merge pull request #7798 from valeriosetti/backport-7614
Backport: crypto_config_test_driver_extension: handle PUBLIC_KEY the same way as KEY_PAIRs
2023-06-19 16:50:15 +02:00
Valerio Setti
e20ec4f1dd crypto_config_test_driver_extension: treat PUBLIC_KEY the same way as KEY_PAIR
Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
2023-06-19 10:03:29 +02:00
Pengyu Lv
e1136d5eb4 Update test-ca2.crt[.der] and server5.crt[.der]
Update these files to match the data in `library/certs.c`.

Signed-off-by: Pengyu Lv <pengyu.lv@arm.com>
2023-06-19 10:17:21 +08:00
Gilles Peskine
d5f4039227
Merge pull request #7739 from davidhorstmann-arm/2.28-fix-iar-typo
[Backport 2.28] Fix typo in CMakeList.txt in IAR compiler flags
2023-06-15 19:23:56 +02:00
David Horstmann
7435651068 Reword changelog entry
Signed-off-by: David Horstmann <david.horstmann@arm.com>
2023-06-15 14:09:05 +01:00
Pengyu Lv
41bb446d12 Update TEST_CA_CRT_EC_PEM and TEST_CA_CRT_EC_DER
To retain the ABI compatibility, we need the DER
data to be in the exact size of 520 bytes. So,
these data are regenerated by unsetting the
'critical' flag of 'basic_constraints' extension,
though the extension should be critical for this
CA according to RFC5280 section 4.2.1.9.

Signed-off-by: Pengyu Lv <pengyu.lv@arm.com>
2023-06-15 15:41:30 +08:00