Skip to content

Commit a0eb5c3

Browse files
mbedTLS 4.x upgrade.
1 parent 413d615 commit a0eb5c3

9 files changed

Lines changed: 30 additions & 7 deletions

File tree

‎slc/apps/lighting_app/thread/matter_thread_soc_lighting_app_freertos.slcp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ configuration:
119119
value: 0
120120
- name: OPENTHREAD_CONFIG_LOG_OUTPUT
121121
value: OPENTHREAD_CONFIG_LOG_OUTPUT_APP
122+
- name: SL_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
123+
value: 1
122124
- name: SL_MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
123125
value: 1
124126
condition: [ot_coap_cert_libs]

‎slc/apps/lighting_app/wifi/matter_wifi_soc_lighting_app_freertos.slcp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ sdk_extension:
1010
version: "2.9.0"
1111
vendor: silabs
1212
- id: wiseconnect3_sdk
13-
version: "4.1.0"
13+
version: "4.2.0"
1414
vendor: silabs
1515

1616
component:

‎slc/component/matter-clusters/matter_groups.slcc‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,28 @@ requires:
1515
- name: matter_scenes_support
1616
source:
1717
- path: third_party/matter_sdk/src/app/clusters/groups-server/CodegenIntegration.cpp
18-
unless: [matter_code_driven_dm]
19-
- path: third_party/matter_sdk/src/app/clusters/groups-server/GroupsCluster.cpp
18+
#unless: [matter_code_driven_dm]
19+
# Groupcast supersedes the Groups cluster commands, so it selects the
20+
# compatibility-only stub instead of the full implementation.
21+
- path: third_party/matter_sdk/src/app/clusters/groups-server/GroupsClusterImpl.cpp
22+
unless: [matter_groupcast]
23+
- path: third_party/matter_sdk/src/app/clusters/groups-server/StubbedGroupsCluster.cpp
24+
condition: [matter_groupcast]
2025
include:
2126
- path: third_party/matter_sdk/src/app/clusters/groups-server
2227
file_list:
2328
- path: GroupsCluster.h
29+
- path: GroupsClusterContext.h
30+
- path: GroupsClusterImpl.h
31+
unless: [matter_groupcast]
32+
- path: StubbedGroupsCluster.h
33+
condition: [matter_groupcast]
2434
template_contribution:
2535
- name: component_catalog
26-
value: matter_groups
36+
value: matter_groups
37+
define:
38+
# Keeps the implementation GroupsCluster.h aliases in sync with the source
39+
# compiled above. Mirrors chip_config_use_stubbed_groups_cluster in GN.
40+
- name: CHIP_CONFIG_USE_STUBBED_GROUPS_CLUSTER
41+
value: 1
42+
condition: [matter_groupcast]

‎slc/component/matter-platform/device-attestation-credentials/matter_provision_default.slcc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ include:
4141
- path: SilabsTestEventTriggerDelegate.h
4242

4343
source:
44+
- path: third_party/matter_sdk/examples/platform/silabs/provision/ProvisionStorageCommon.cpp
4445
- path: third_party/matter_sdk/examples/platform/silabs/provision/ProvisionStorageDefault.cpp
4546
- path: third_party/matter_sdk/examples/platform/silabs/provision/ProvisionStorageCustom.cpp
4647

‎slc/component/matter-platform/device-attestation-credentials/matter_provision_flash.slcc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ include:
4040
- path: SilabsTestEventTriggerDelegate.h
4141

4242
source:
43+
- path: third_party/matter_sdk/examples/platform/silabs/provision/ProvisionStorageCommon.cpp
4344
- path: third_party/matter_sdk/examples/platform/silabs/provision/ProvisionStorageFlash.cpp
4445
- path: third_party/matter_sdk/examples/platform/silabs/provision/ProvisionStorageCustom.cpp
4546

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ requires:
3939
# wiseconnect SDK components
4040
- name: psa_driver
4141
- name: psa_crypto
42-
- name: psa_crypto_ecc_secp192r1
4342
- name: psa_crypto_ecc_secp256r1
4443
- name: psa_crypto_common
4544
- name: psa_crypto_source

‎src/app/zap-templates/app-templates.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@
4747
{
4848
"name": "cluster_objects_attribute_typeinfo",
4949
"path": "../../../third_party/matter_sdk/src/app/zap-templates/partials/cluster-objects-attribute-typeinfo.zapt"
50+
},
51+
{
52+
"name": "accessor_default_type",
53+
"path": "../../../third_party/matter_sdk/src/app/zap-templates/partials/accessor-default-type.zapt"
5054
}
5155
],
5256
"templates": [

‎third_party/matter_sdk‎

Submodule matter_sdk updated 2869 files

‎third_party/matter_support‎

Submodule matter_support updated 850 files

0 commit comments

Comments
 (0)