EFR32: DeviceAttestationCredentialsProvider implemented. (#20005)

* EFR32: DeviceAttestationCredentialsProvider implemented. * EFR32: DeviceAttestationCredentialsProvider: Review comments applied. * EFR32: DeviceAttestationCredentialsProvider: Review comments applied.
project-chip · Jul 6, 2022 · 43cbeef · 43cbeef
1 parent b4bf35d
commit 43cbeef
Show file tree

Hide file tree

Showing 23 changed files with 343 additions and 42 deletions.
diff --git a/examples/chef/efr32/BUILD.gn b/examples/chef/efr32/BUILD.gn
@@ -336,6 +336,11 @@ efr32_executable("chef_app") {
  ]
  }
 
+ # Attestation Credentials
+ if (chip_build_platform_attestation_credentials_provider) {
+ deps += [ "${examples_plat_dir}:efr32-attestation-credentials" ]
+ }
+
  output_dir = root_out_dir
 }
 

diff --git a/examples/chef/efr32/src/AppTask.cpp b/examples/chef/efr32/src/AppTask.cpp
@@ -43,9 +43,6 @@
 
 #include <assert.h>
 
-#include <credentials/DeviceAttestationCredsProvider.h>
-#include <credentials/examples/DeviceAttestationCredsExample.h>
-
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 #include <setup_payload/SetupPayload.h>
 
@@ -167,7 +164,6 @@ Identify gIdentify = {
 
 } // namespace
 using namespace chip::TLV;
-using namespace ::chip::Credentials;
 using namespace ::chip::DeviceLayer;
 
 AppTask AppTask::sAppTask;
@@ -205,11 +201,6 @@ CHIP_ERROR AppTask::Init()
  sWiFiNetworkCommissioningInstance.Init();
 #endif
 
- chip::DeviceLayer::PlatformMgr().LockChipStack();
- // Initialize device attestation config
- SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
- chip::DeviceLayer::PlatformMgr().UnlockChipStack();
-
  // Create FreeRTOS sw timer for Function Selection.
  sFunctionTimer = xTimerCreate("FnTmr", // Just a text name, not used by the RTOS kernel
  1, // == default timer period (mS)

diff --git a/examples/chef/efr32/src/main.cpp b/examples/chef/efr32/src/main.cpp
@@ -25,12 +25,19 @@
 #include "sl_system_kernel.h"
 #include <DeviceInfoProviderImpl.h>
 #include <app/server/Server.h>
+#include <credentials/DeviceAttestationCredsProvider.h>
 #include <matter_config.h>
+#ifdef EFR32_ATTESTATION_CREDENTIALS
+#include <examples/platform/efr32/EFR32DeviceAttestationCreds.h>
+#else
+#include <credentials/examples/DeviceAttestationCredsExample.h>
+#endif
 
 #define BLE_DEV_NAME "SiLabs-Chef-App"
 using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::DeviceLayer;
+using namespace ::chip::Credentials;
 
 #define UNUSED_PARAMETER(a) (a = a)
 
@@ -49,6 +56,15 @@ int main(void)
  gExampleDeviceInfoProvider.SetStorageDelegate(&Server::GetInstance().GetPersistentStorage());
  chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
 
+ chip::DeviceLayer::PlatformMgr().LockChipStack();
+ // Initialize device attestation config
+#ifdef EFR32_ATTESTATION_CREDENTIALS
+ SetDeviceAttestationCredentialsProvider(EFR32::GetEFR32DacProvider());
+#else
+ SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+#endif
+ chip::DeviceLayer::PlatformMgr().UnlockChipStack();
+
  EFR32_LOG("Starting App Task");
  if (GetAppTask().StartAppTask() != CHIP_NO_ERROR)
  appError(CHIP_ERROR_INTERNAL);

diff --git a/examples/light-switch-app/efr32/BUILD.gn b/examples/light-switch-app/efr32/BUILD.gn
@@ -213,6 +213,11 @@ efr32_executable("light_switch_app") {
  }
  }
 
+ # Attestation Credentials
+ if (chip_build_platform_attestation_credentials_provider) {
+ deps += [ "${examples_plat_dir}:efr32-attestation-credentials" ]
+ }
+
  if (chip_enable_ota_requestor) {
  defines += [ "EFR32_OTA_ENABLED" ]
  sources += [ "${examples_plat_dir}/OTAConfig.cpp" ]

diff --git a/examples/light-switch-app/efr32/src/AppTask.cpp b/examples/light-switch-app/efr32/src/AppTask.cpp
@@ -41,9 +41,6 @@
 
 #include <assert.h>
 
-#include <credentials/DeviceAttestationCredsProvider.h>
-#include <credentials/examples/DeviceAttestationCredsExample.h>
-
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 #include <setup_payload/SetupPayload.h>
 
@@ -158,7 +155,6 @@ Identify gIdentify = {
 };
 } // namespace
 using namespace chip::TLV;
-using namespace ::chip::Credentials;
 using namespace ::chip::DeviceLayer;
 
 AppTask AppTask::sAppTask;
@@ -196,11 +192,6 @@ CHIP_ERROR AppTask::Init()
  sWiFiNetworkCommissioningInstance.Init();
 #endif
 
- chip::DeviceLayer::PlatformMgr().LockChipStack();
- // Initialize device attestation config
- SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
- chip::DeviceLayer::PlatformMgr().UnlockChipStack();
-
  // Create FreeRTOS sw timer for Function Selection.
  sFunctionTimer = xTimerCreate("FnTmr", // Just a text name, not used by the RTOS kernel
  1, // == default timer period (mS)

diff --git a/examples/light-switch-app/efr32/src/main.cpp b/examples/light-switch-app/efr32/src/main.cpp
@@ -25,12 +25,19 @@
 #include "sl_system_kernel.h"
 #include <DeviceInfoProviderImpl.h>
 #include <app/server/Server.h>
+#include <credentials/DeviceAttestationCredsProvider.h>
 #include <matter_config.h>
+#ifdef EFR32_ATTESTATION_CREDENTIALS
+#include <examples/platform/efr32/EFR32DeviceAttestationCreds.h>
+#else
+#include <credentials/examples/DeviceAttestationCredsExample.h>
+#endif
 
 #define BLE_DEV_NAME "SiLabs-Light-Switch"
 using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::DeviceLayer;
+using namespace ::chip::Credentials;
 
 #define UNUSED_PARAMETER(a) (a = a)
 
@@ -49,6 +56,15 @@ int main(void)
  gExampleDeviceInfoProvider.SetStorageDelegate(&Server::GetInstance().GetPersistentStorage());
  chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
 
+ chip::DeviceLayer::PlatformMgr().LockChipStack();
+ // Initialize device attestation config
+#ifdef EFR32_ATTESTATION_CREDENTIALS
+ SetDeviceAttestationCredentialsProvider(EFR32::GetEFR32DacProvider());
+#else
+ SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+#endif
+ chip::DeviceLayer::PlatformMgr().UnlockChipStack();
+
  EFR32_LOG("Starting App Task");
  if (GetAppTask().StartAppTask() != CHIP_NO_ERROR)
  appError(CHIP_ERROR_INTERNAL);

diff --git a/examples/lighting-app/efr32/BUILD.gn b/examples/lighting-app/efr32/BUILD.gn
@@ -331,6 +331,11 @@ efr32_executable("lighting_app") {
  ]
  }
 
+ # Attestation Credentials
+ if (chip_build_platform_attestation_credentials_provider) {
+ deps += [ "${examples_plat_dir}:efr32-attestation-credentials" ]
+ }
+
  output_dir = root_out_dir
 }
 

diff --git a/examples/lighting-app/efr32/src/AppTask.cpp b/examples/lighting-app/efr32/src/AppTask.cpp
@@ -39,9 +39,6 @@
 
 #include <assert.h>
 
-#include <credentials/DeviceAttestationCredsProvider.h>
-#include <credentials/examples/DeviceAttestationCredsExample.h>
-
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 #include <setup_payload/SetupPayload.h>
 
@@ -163,7 +160,6 @@ Identify gIdentify = {
 } // namespace
 
 using namespace chip::TLV;
-using namespace ::chip::Credentials;
 using namespace ::chip::DeviceLayer;
 
 AppTask AppTask::sAppTask;
@@ -201,11 +197,6 @@ CHIP_ERROR AppTask::Init()
  sWiFiNetworkCommissioningInstance.Init();
 #endif
 
- chip::DeviceLayer::PlatformMgr().LockChipStack();
- // Initialize device attestation config
- SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
- chip::DeviceLayer::PlatformMgr().UnlockChipStack();
-
  // Create FreeRTOS sw timer for Function Selection.
  sFunctionTimer = xTimerCreate("FnTmr", // Just a text name, not used by the RTOS kernel
  1, // == default timer period (mS)

diff --git a/examples/lighting-app/efr32/src/main.cpp b/examples/lighting-app/efr32/src/main.cpp
@@ -25,12 +25,19 @@
 #include "sl_system_kernel.h"
 #include <DeviceInfoProviderImpl.h>
 #include <app/server/Server.h>
+#include <credentials/DeviceAttestationCredsProvider.h>
 #include <matter_config.h>
+#ifdef EFR32_ATTESTATION_CREDENTIALS
+#include <examples/platform/efr32/EFR32DeviceAttestationCreds.h>
+#else
+#include <credentials/examples/DeviceAttestationCredsExample.h>
+#endif
 
 #define BLE_DEV_NAME "SiLabs-Light"
 using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::DeviceLayer;
+using namespace ::chip::Credentials;
 
 #define UNUSED_PARAMETER(a) (a = a)
 
@@ -49,6 +56,15 @@ int main(void)
  gExampleDeviceInfoProvider.SetStorageDelegate(&chip::Server::GetInstance().GetPersistentStorage());
  chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
 
+ chip::DeviceLayer::PlatformMgr().LockChipStack();
+ // Initialize device attestation config
+#ifdef EFR32_ATTESTATION_CREDENTIALS
+ SetDeviceAttestationCredentialsProvider(EFR32::GetEFR32DacProvider());
+#else
+ SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+#endif
+ chip::DeviceLayer::PlatformMgr().UnlockChipStack();
+
  EFR32_LOG("Starting App Task");
  if (GetAppTask().StartAppTask() != CHIP_NO_ERROR)
  appError(CHIP_ERROR_INTERNAL);

diff --git a/examples/lock-app/efr32/BUILD.gn b/examples/lock-app/efr32/BUILD.gn
@@ -328,6 +328,11 @@ efr32_executable("lock_app") {
  ]
  }
 
+ # Attestation Credentials
+ if (chip_build_platform_attestation_credentials_provider) {
+ deps += [ "${examples_plat_dir}:efr32-attestation-credentials" ]
+ }
+
  output_dir = root_out_dir
 }
 group("efr32") {

diff --git a/examples/lock-app/efr32/src/AppTask.cpp b/examples/lock-app/efr32/src/AppTask.cpp
@@ -43,9 +43,6 @@
 
 #include <assert.h>
 
-#include <credentials/DeviceAttestationCredsProvider.h>
-#include <credentials/examples/DeviceAttestationCredsExample.h>
-
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 #include <setup_payload/SetupPayload.h>
 
@@ -173,7 +170,6 @@ Identify gIdentify = {
 } // namespace
 
 using namespace chip::TLV;
-using namespace ::chip::Credentials;
 using namespace ::chip::DeviceLayer;
 
 AppTask AppTask::sAppTask;
@@ -211,11 +207,6 @@ CHIP_ERROR AppTask::Init()
  sWiFiNetworkCommissioningInstance.Init();
 #endif
 
- chip::DeviceLayer::PlatformMgr().LockChipStack();
- // Initialize device attestation config
- SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
- chip::DeviceLayer::PlatformMgr().UnlockChipStack();
-
  // Create FreeRTOS sw timer for Function Selection.
  sFunctionTimer = xTimerCreate("FnTmr", // Just a text name, not used by the RTOS kernel
  1, // == default timer period (mS)

diff --git a/examples/lock-app/efr32/src/main.cpp b/examples/lock-app/efr32/src/main.cpp
@@ -25,12 +25,19 @@
 #include "sl_system_kernel.h"
 #include <DeviceInfoProviderImpl.h>
 #include <app/server/Server.h>
+#include <credentials/DeviceAttestationCredsProvider.h>
 #include <matter_config.h>
+#ifdef EFR32_ATTESTATION_CREDENTIALS
+#include <examples/platform/efr32/EFR32DeviceAttestationCreds.h>
+#else
+#include <credentials/examples/DeviceAttestationCredsExample.h>
+#endif
 
 #define BLE_DEV_NAME "SiLabs-Door-Lock"
 using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::DeviceLayer;
+using namespace ::chip::Credentials;
 
 #define UNUSED_PARAMETER(a) (a = a)
 
@@ -49,6 +56,15 @@ int main(void)
  gExampleDeviceInfoProvider.SetStorageDelegate(&Server::GetInstance().GetPersistentStorage());
  chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
 
+ chip::DeviceLayer::PlatformMgr().LockChipStack();
+ // Initialize device attestation config
+#ifdef EFR32_ATTESTATION_CREDENTIALS
+ SetDeviceAttestationCredentialsProvider(EFR32::GetEFR32DacProvider());
+#else
+ SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+#endif
+ chip::DeviceLayer::PlatformMgr().UnlockChipStack();
+
  EFR32_LOG("Starting App Task");
  if (GetAppTask().StartAppTask() != CHIP_NO_ERROR)
  appError(CHIP_ERROR_INTERNAL);

diff --git a/examples/platform/efr32/BUILD.gn b/examples/platform/efr32/BUILD.gn
@@ -64,3 +64,26 @@ source_set("efr-matter-shell") {
  ]
  }
 }
+
+config("attestation-credentials-config") {
+ include_dirs = [ "${chip_root}" ]
+
+ defines = [
+ # Set to 1 to enable EFR32 attestation credentials
+ "EFR32_ATTESTATION_CREDENTIALS",
+ ]
+}
+
+source_set("efr32-attestation-credentials") {
+ sources = [
+ "EFR32DeviceAttestationCreds.cpp",
+ "EFR32DeviceAttestationCreds.h",
+ ]
+
+ public_deps = [
+ "${chip_root}/src/credentials",
+ "${chip_root}/src/platform:platform_base",
+ ]
+
+ public_configs = [ ":attestation-credentials-config" ]
+}