Skip to content

Commit bc65be7

Browse files
MATTER-5886: Adds fix for PSA crypto flavor of 917SoC (SiliconLabsSoftware#425)
1 parent a74d5fb commit bc65be7

3 files changed

Lines changed: 16 additions & 16 deletions

File tree

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ provides:
1414
requires:
1515
- name: iostream
1616
- name: iostream_rtt
17-
- name: matter_crypto_tinycrypt_siwx917 # Provisioning Flash only support Tinycript crypto flavor
17+
- name: matter_crypto_siwx917
1818
condition: [device_family_siwg917]
1919

2020
conflicts:
@@ -59,6 +59,11 @@ library:
5959
- path: third_party/matter_support/provision/libs/libProvision_si917.a
6060
condition:
6161
- device_family_siwg917
62+
- matter_crypto_tinycrypt_siwx917
63+
- path: third_party/matter_support/provision/libs/libProvisionPSA_si917.a
64+
condition:
65+
- device_family_siwg917
66+
- matter_crypto_psa_siwx917
6267

6368
template_contribution:
6469
# Series-3 will use common token manager.

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ metadata:
1111

1212
provides:
1313
- name: matter_crypto_psa_siwx917
14+
- name: matter_crypto_siwx917
1415

1516
conflicts:
1617
- name: matter_crypto_tinycrypt_siwx917
@@ -25,7 +26,7 @@ requires:
2526
- name: psa_crypto_hkdf
2627
- name: psa_crypto_sha256
2728

28-
# Mbedtls components
29+
# mbedTLS components
2930
- name: mbedtls_platform_dynamic_memory_allocation_config_init_runtime
3031
- name: mbedtls_base64
3132
- name: mbedtls_cmac
@@ -35,14 +36,11 @@ requires:
3536
- name: mbedtls_version
3637
- name: mbedtls_pkcs5
3738

38-
# Wiseconnect SDK 3.xx.xx components
39+
# wiseconnect SDK components
3940
- name: psa_driver
4041
- name: psa_crypto
4142
- name: psa_crypto_ecc_secp192r1
42-
- name: psa_crypto_ecc_secp224r1
4343
- name: psa_crypto_ecc_secp256r1
44-
- name: psa_crypto_ecc_secp384r1
45-
- name: psa_crypto_ecc_secp521r1
4644
- name: psa_crypto_common
4745
- name: psa_crypto_source
4846
- name: psa_crypto_trng
@@ -86,9 +84,9 @@ include:
8684
- path: siwx917-chip-psa-config.h
8785

8886
define:
89-
- name: MBEDTLS_CONFIG_FILE
90-
value: \"siwx917-chip-mbedtls-config.h\"
91-
- name: MBEDTLS_PSA_CRYPTO_CONFIG_FILE
92-
value: \"siwx917-psa-crypto-config.h\"
87+
- name: MBEDTLS_USER_CONFIG_FILE
88+
value: <siwx917-chip-mbedtls-config.h>
89+
- name: MBEDTLS_PSA_CRYPTO_USER_CONFIG_FILE
90+
value: <siwx917-chip-psa-config.h>
9391
- name: SLI_SI91X_TRNG_DUPLICATE_CHECK
9492
value: 0

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ metadata:
1111

1212
provides:
1313
- name: matter_crypto_tinycrypt_siwx917
14+
- name: matter_crypto_siwx917
1415

1516
requires:
1617
# mbedTLS components
@@ -19,29 +20,25 @@ requires:
1920
- name: mbedtls_platform_dynamic_memory_allocation_config_init_runtime
2021

2122
- name: mbedtls_aes
22-
- name: mbedtls_asn1
2323
- name: mbedtls_base64
2424
- name: mbedtls_ccm
25-
- name: mbedtls_cipher
25+
- name: mbedtls_cmac
2626
- name: mbedtls_ecdh
2727
- name: mbedtls_ecdsa
2828
- name: mbedtls_ecc
29-
- name: mbedtls_error
3029
- name: mbedtls_hash
3130
- name: mbedtls_hkdf
32-
- name: mbedtls_jpake
3331
- name: mbedtls_mpi
3432
- name: mbedtls_oid
3533
- name: mbedtls_pem
3634
- name: mbedtls_pkcs5
3735
- name: mbedtls_pki
3836
- name: mbedtls_random
3937
- name: mbedtls_sha256
40-
- name: mbedtls_sha512
4138
- name: mbedtls_version
4239
- name: mbedtls_x509
4340

44-
# Wiseconnect SDK 3.xx.xx components
41+
# wiseconnect SDK components
4542
- name: sl_si91x_trng
4643

4744
conflicts:

0 commit comments

Comments
 (0)