update to 3.6.1 #60

tomi-font · 2024-09-02T09:12:33Z

Just re-applied the TF-M patches and added a small MCUboot fix from #58.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

In particular, fix an off-by-one error right after I explain how the number is off by one from what you'd expect. State explicitly that the number can be negative. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

…rflow-3.6 Backport 3.6: Fix stack buffer overflow in ECDSA signature format conversions

Explain that the hybrid key store is the historical implementation and neither alternative is a drop-in replacement. Discuss how we could potentially reduce the number of variants after the next major release. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

…ument-3.6 Backport 3.6: Document that MBEDTLS_PSA_HMAC_DRBG_MD_TYPE does not force HMAC

This file is used for detecting which project a script is being run from. Signed-off-by: Thomas Daubney <thomas.daubney@arm.com>

Signed-off-by: Thomas Daubney <thomas.daubney@arm.com>

Signed-off-by: Gabor Mezei <gabor.mezei@arm.com>

[Backport 3.6] Adapt config.py to configuration file split

Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>

…op_info-3.6 [Backport 3.6] tests/ssl_helpers: Check that message queue is popped

Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>

…doc-3.6 Backport 3.6: Document the key store design

Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>

Signed-off-by: Benjamin Baratte <benjamin.baratte@st.com> applied using: git am modules/tee/tf-m/trusted-firmware-m/lib/ext/mbedcrypto/\ 0003-Allow-SE-key-to-use-key-vendor-id-within-PSA-crypto.patch Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>

This patch amends the order of initialisations performed in psa_crypto_init() to make sure that the driver wrappers based on the PSA driver API are initialised just after the key slots in memory, both of them at the beginning of the initialisation sequence. Signed-off-by: Antonio de Angelis <antonio.deangelis@arm.com> applied using: git am modules/tee/tf-m/trusted-firmware-m/lib/ext/mbedcrypto/\ 0004-Initialise-driver-wrappers-as-first-step-in-psa_cryp.patch Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>

Manually hardcode PSA driver entry points for the CC3XX driver into psa crypto driver wrappers file (and provide missing entry point definitions if any). This is a temporary solution until the codegen framework is available for automatic integration. Signed-off-by: Antonio de Angelis <antonio.deangelis@arm.com> applied using: git am modules/tee/tf-m/trusted-firmware-m/lib/ext/mbedcrypto/\ 0005-Hardcode-CC3XX-entry-points.patch Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>

CC312 driver want to use hash in md for entropy operations. Enable psa_can_do_hash by directly returning 1. This is a workaround for current cc312 driver. After switching to new driver, this workaround is not needed. Signed-off-by: Summer Qin <summer.qin@arm.com> applied using: git am modules/tee/tf-m/trusted-firmware-m/lib/ext/mbedcrypto/\ 0006-Enable-psa_can_do_hash.patch Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>

This reverts commit f9bbe0d. See the following revert commit for an explanation. Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>

This reverts commit 469f781. Remove the dependency on the framework directory. It was introduced in MbedTLS 3.6.0 and for now doesn't do much more than make CMake fail if `git submodule update --init` is not run. This needs to be revisited once bigger changes are made (with Mbed TLS 4.0) and the whole repository structure changes. Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>

Gate relevant files for the thin PSA crypto core on MCUBOOT_USE_PSA_CRYPTO during BL2 build instead of MBEDTLS_PSA_CRYPTO_C which is not defined in such case. A full solution might require a change in config strategy of Mbed TLS with the definition Signed-off-by: Antonio de Angelis <antonio.deangelis@arm.com> applied using: git am modules/tee/tf-m/trusted-firmware-m/lib/ext/mbedcrypto/\ 0007-Enable-sources-when-MCUBOOT_USE_PSA_CRYPTO-and-not-M.patch Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>

MCUboot has its own version of the PSA Crypto core, named "thin_psa_crypto_core.c" which is included in MCUboot's build process when the MCUBOOT_USE_PSA_CRYPTO build symbol is set. MCUBOOT_USE_PSA_CRYPTO mimics what MBEDTLS_PSA_CRYPTO_C does for the official Mbed TLS, so we need to replicate this symbol in "config_psa.h" in order to get the proper PSA builtin support. Signed-off-by: Valerio Setti <vsetti@baylibre.com> Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>

ithinuel · 2024-09-02T15:11:30Z

Do the commits like Enable psa_can_do_hash really need to be reverted and reapplied immediately ?

tomi-font · 2024-09-03T06:15:56Z

Do the commits like Enable psa_can_do_hash really need to be reverted and reapplied immediately ?

Yeah, or rather this is the procedure we use. First revert the previously applied patches to be completely aligned with upstream, merge the new version to pull in, then re-apply whatever needed patches. No trying to pull in upstream commits on top of patches. Otherwise, there would be risks of (unending) merge conflicts, plus we getthe benefit that the applied patches don't get lost in the history.
Somehow Git shows the revert commits after the Mbed TLS ones (maybe because of the order they were written at, i.e. Mbed TLS ones existed already before the revert ones?), but the reverts are really done as the first thing.

valeriosetti

I checked that:

up to bd3a26f the only difference with official Mbed TLS v3.6.1 tag is in in the framework folder. This is a submodule now and it's only used for Mbed TLS testing (which is something we don't do in Zephyr), so it's OK to skip it. Patches 5b86c71 and 95583ee are for this indeed.
all other TF-M/Zephyr patches are reverted before and re-applied after the merge of the v3.6.1 branch of Mbed TLS.

In short IMO this is a correct update to the new 3.6.1 LTS release.

carlescufi · 2024-09-03T09:23:13Z

Somehow Git shows the revert commits after the Mbed TLS ones (maybe because of the order they were written at, i.e. Mbed TLS ones existed already before the revert ones?), but the reverts are really done as the first thing.

Git always shows the commits in order they have been created, so I guess that you are probably talking about commits that come from a merge operation. Those may be displayed differently.

library/psa_crypto.c

Vge0rge

A small nit, but overall looks good

gilles-peskine-arm and others added 30 commits July 31, 2024 00:12

Update macro name about the static key store

7d8abab

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Improve and fix explanation of next_free

ac6b610

In particular, fix an off-by-one error right after I explain how the number is off by one from what you'd expect. State explicitly that the number can be negative. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Link to issue about freeing empty slices

dbd726b

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Merge pull request #1259 from gilles-peskine-arm/ecdsa-conversion-ove…

7fb5007

…rflow-3.6 Backport 3.6: Fix stack buffer overflow in ECDSA signature format conversions

Expand on performance

f13fdf8

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Miscellaneous clarifications

fd01bec

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Merge pull request #1257 from gilles-peskine-arm/psa-drbg-no-hmac-doc…

e55bc34

…ument-3.6 Backport 3.6: Document that MBEDTLS_PSA_HMAC_DRBG_MD_TYPE does not force HMAC

Introduce project_name.txt

ecb3936

This file is used for detecting which project a script is being run from. Signed-off-by: Thomas Daubney <thomas.daubney@arm.com>

Add functions to detect project

2f55640

Signed-off-by: Thomas Daubney <thomas.daubney@arm.com>

Update framework

fef3cc3

Signed-off-by: Gabor Mezei <gabor.mezei@arm.com>

Merge pull request #9432 from gabor-mezei-arm/9158_bp36_update_framework

d289fa1

[Backport 3.6] Adapt config.py to configuration file split

Created placeholder component files.

7771119

Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>

Applied consistent style.

f1f086e

Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>

Merge pull request #9395 from sezrab/mbedtls_test_ssl_message_queue_p…

52992e5

…op_info-3.6 [Backport 3.6] tests/ssl_helpers: Check that message queue is popped

Separate all.sh from components.

f7d1cb0

Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>

Extract basic-components into a separate file.

e431739

Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>

Extract build-components into a separate file.

2148e5c

Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>

Extract compiler-components into a separate file.

3bd6c30

Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>

Extract compliance-components into a separate file.

b298d1f

Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>

Merge pull request #9309 from gilles-peskine-arm/psa-keystore-design-…

b49e884

…doc-3.6 Backport 3.6: Document the key store design

Extract configuration-crypto-components into a separate file.

3ece57e

Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>

Extract configuration-platform components into a separate file.

5b4386c

Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>

Extract configuration-x509 components into a separate file.

27968c1

Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>

Extract configuration components into a separate file.

93a8c08

Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>

Extract platform components into a separate file.

f0cd95b

Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>

Extract sanitizer components into a separate file.

4a2a351

Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>

all.sh/components: Moved more components to configuration tls.

85347d1

Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>

all.sh/components: Fixed a typo in configuration-tls.

4ca7b14

Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>

all.sh/components: Moved more components to configuration crypto.

0c0c3e1

Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>

BenBaratte and others added 4 commits September 2, 2024 11:57

zephyrbot mentioned this pull request Sep 2, 2024

manifest: mbedtls: update to 3.6.1 zephyrproject-rtos/zephyr#77874

Merged

carlescufi requested review from d3zd3z, Vge0rge, valeriosetti, ceolin, JordanYates and ithinuel September 2, 2024 11:43

tomi-font and others added 4 commits September 2, 2024 15:02

Revert "Show guidance if the framework is not found"

d03fc39

This reverts commit f9bbe0d. See the following revert commit for an explanation. Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>

tomi-font force-pushed the bump_to_3.6.1 branch from 2b11622 to b9b26b7 Compare September 2, 2024 12:04

valeriosetti approved these changes Sep 3, 2024

View reviewed changes

zephyrbot mentioned this pull request Sep 3, 2024

socket_tls: add TLS 1.3 support using Mbed TLS zephyrproject-rtos/zephyr#77567

Merged

Vge0rge reviewed Sep 3, 2024

View reviewed changes

library/psa_crypto.c Outdated Show resolved Hide resolved

Vge0rge self-requested a review September 3, 2024 09:58

Vge0rge approved these changes Sep 3, 2024

View reviewed changes

ithinuel approved these changes Sep 4, 2024

View reviewed changes

carlescufi merged commit fb36f3f into zephyrproject-rtos:zephyr Sep 4, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

update to 3.6.1 #60

update to 3.6.1 #60

tomi-font commented Sep 2, 2024

ithinuel commented Sep 2, 2024

tomi-font commented Sep 3, 2024 •

edited

Loading

valeriosetti left a comment

carlescufi commented Sep 3, 2024

Vge0rge left a comment

update to 3.6.1 #60

update to 3.6.1 #60

Conversation

tomi-font commented Sep 2, 2024

ithinuel commented Sep 2, 2024

tomi-font commented Sep 3, 2024 • edited Loading

valeriosetti left a comment

Choose a reason for hiding this comment

carlescufi commented Sep 3, 2024

Vge0rge left a comment

Choose a reason for hiding this comment

tomi-font commented Sep 3, 2024 •

edited

Loading