Skip to content

Fix missing CHIP_CRYPTO_KEYSTORE_PSA flag for xg24devkit, xg24explorerkit, xiao_mg24 - #186

Merged
Tamas Jozsi (silabs-bozont) merged 1 commit into
SiliconLabsSoftware:mainfrom
lboue:fix-matter-crypto-keystore-psa
Jul 31, 2026
Merged

Fix missing CHIP_CRYPTO_KEYSTORE_PSA flag for xg24devkit, xg24explorerkit, xiao_mg24#186
Tamas Jozsi (silabs-bozont) merged 1 commit into
SiliconLabsSoftware:mainfrom
lboue:fix-matter-crypto-keystore-psa

Conversation

@lboue

@lboue Ludovic BOUÉ (lboue) commented Jul 24, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Fixes a build-breaking bug in boards.txt found while investigating the CI failure on Add Matter Binding cluster support with switch/light examples #185 - every Matter sketch (not just Add Matter Binding cluster support with switch/light examples #185's new examples) currently fails to compile for the xg24devkit, xg24explorerkit, and xiao_mg24 boards.
  • Root cause: these three boards already select PSA crypto (MBEDTLS_PSA_CRYPTO_CONFIG_FILE=<psa_crypto_config.h>, MBEDTLS_USER_CONFIG_FILE=<sli_psa_builtin_config.h>) but never define CHIP_CRYPTO_KEYSTORE_PSA. Without it, chip::Crypto::DefaultSessionKeystore (in the vendored Matter SDK's DefaultSessionKeystore.h) is never defined, so Server.h fails with 'DefaultSessionKeystore' in namespace 'chip::Crypto' does not name a type / 'sSessionKeystore' was not declared in this scope.
  • nano_matter and thingplusmatter already set -DCHIP_CRYPTO_KEYSTORE_PSA=1 in their matter protocol stack extra_flags; this adds the same flag to the other three Matter-capable boards, right after -DRADIO_CONFIG_DMP_SUPPORT=1 to match the existing ordering.
  • Confirmed pre-existing on main (unrelated to Add Matter Binding cluster support with switch/light examples #185's code changes) - git show main:boards.txt already lacks the flag for these boards.

Test plan

  • Confirmed the flag is present for all 5 Matter-capable boards after the change (nano_matter, thingplusmatter, xg24devkit, xg24explorerkit, xiao_mg24)
  • Re-run PR build tests CI to confirm matter_air_purifier (and other existing Matter examples) now build for xg24devkit, xg24explorerkit, xiao_mg24

🤖 Generated with Claude Code

…rkit, xiao_mg24

These boards are already configured for PSA crypto (MBEDTLS_PSA_CRYPTO_CONFIG_FILE,
sli_psa_builtin_config.h) but never define CHIP_CRYPTO_KEYSTORE_PSA, so
chip::Crypto::DefaultSessionKeystore is never defined and every Matter sketch
fails to compile for these boards. nano_matter and thingplusmatter already set
this flag; align the other three Matter-capable boards with them.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
@silabs-akosj silabs-akosj added the Community contribution PR contents contributed by the community label Jul 27, 2026
@silabs-bozont Tamas Jozsi (silabs-bozont) added Under review Request or issue under review Run CI Matter Run Matter specific build tests labels Jul 30, 2026
@github-actions github-actions Bot removed the Run CI Matter Run Matter specific build tests label Jul 30, 2026
@silabs-bozont
Tamas Jozsi (silabs-bozont) merged commit 387f71e into SiliconLabsSoftware:main Jul 31, 2026
9 checks passed
@silabs-bozont Tamas Jozsi (silabs-bozont) removed the Under review Request or issue under review label Jul 31, 2026
@github-actions github-actions Bot locked and limited conversation to collaborators Jul 31, 2026
@lboue
Ludovic BOUÉ (lboue) deleted the fix-matter-crypto-keystore-psa branch July 31, 2026 12:55
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Community contribution PR contents contributed by the community

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants