Skip to content

Commit f55a8b3

Browse files
Mbed TLS 4.x upgrade.
1 parent c4c8b6d commit f55a8b3

7 files changed

Lines changed: 23 additions & 6 deletions

File tree

‎slc/component/matter-platform/crypto/matter_crypto.slcc‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,18 @@ define:
8686
template_contribution:
8787
- name: mbedtls_config
8888
value: MBEDTLS_MPI_WINDOW_SIZE 1
89+
90+
source:
91+
# The non-secure TrustZone image cannot include psa_crypto_source because it
92+
# conflicts with the secure-key-library interface. CHIP's SPAKE2+ fallback
93+
# still uses these Mbed TLS bignum and ECP APIs directly.
94+
- path: third_party/simplicity_sdk/mbedtls/tf-psa-crypto/drivers/builtin/src/bignum_core.c
95+
condition: [trustzone_nonsecure]
96+
- path: third_party/simplicity_sdk/mbedtls/tf-psa-crypto/drivers/builtin/src/bignum.c
97+
condition: [trustzone_nonsecure]
98+
- path: third_party/simplicity_sdk/mbedtls/tf-psa-crypto/drivers/builtin/src/ecp_curves.c
99+
condition: [trustzone_nonsecure]
100+
- path: third_party/simplicity_sdk/mbedtls/tf-psa-crypto/drivers/builtin/src/ecp_curves_new.c
101+
condition: [trustzone_nonsecure]
102+
- path: third_party/simplicity_sdk/mbedtls/tf-psa-crypto/drivers/builtin/src/ecp.c
103+
condition: [trustzone_nonsecure]

‎slc/component/matter-platform/siwx917/matter_crypto_tinycrypt_siwx917.slcc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ requires:
2727
- name: mbedtls_ecdsa
2828
- name: mbedtls_ecc
2929
- name: mbedtls_hash
30-
- name: mbedtls_hkdf
3130
- name: mbedtls_mpi
32-
- name: mbedtls_oid
3331
- name: mbedtls_pem
3432
- name: mbedtls_pkcs5
3533
- name: mbedtls_pki

‎slc/component/matter-platform/wstk-leds/matter_rgb_leds.slcc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,17 @@ metadata:
1010
provides:
1111
- name: matter_rgb_leds
1212
requires:
13+
# Si91x boards use sl_si91x_led_917 for RGB LEDs. simple_rgb_pwm_led is the
14+
# EFR32 PWM driver and requires EFR32 HAL components.
1315
- name: simple_rgb_pwm_led
1416
condition: [hardware_board_has_rgb]
17+
unless: [device_si91x]
1518
recommends:
1619
- id: simple_rgb_pwm_led
1720
vendor: silabs
1821
instance: [rgb_led0]
1922
condition: [hardware_board_has_rgb]
23+
unless: [device_si91x]
2024
include:
2125
- path: third_party/matter_sdk/examples/platform/silabs/rgb_led
2226
file_list:

‎third_party/matter_sdk‎

Submodule matter_sdk updated 39 files

‎third_party/matter_support‎

Submodule matter_support updated 165 files

‎third_party/simplicity_sdk‎

Submodule simplicity_sdk updated 13170 files

‎third_party/wifi_sdk‎

Submodule wifi_sdk updated 390 files

0 commit comments

Comments
 (0)