[Infineon][1.0] Add args for CYW30739 to provision DAC/PAI/CD. (#23068)

* [Infineon][1.0] Add args for CYW30739 to provision DAC/PAI/CD. * Implement DeviceAttestationCredentialsProvider APIs by FactoryDataProvider for CYW30739. * Add GN args to provision DAC/PAI/CD from specified der files into CYW30739 flash. * Obsolete CYW30739 static_config.txt by GN args. * CYW30739Config loads factory data only from SS flash section. * Address review comments.
project-chip · Nov 22, 2022 · d662734 · d662734
1 parent 75b76de
commit d662734
Show file tree

Hide file tree

Showing 24 changed files with 631 additions and 163 deletions.
diff --git a/examples/lighting-app/infineon/cyw30739/README.md b/examples/lighting-app/infineon/cyw30739/README.md
@@ -59,6 +59,24 @@ dataset and CASE credentials are then provided.
     $ rm -rf out/
     ```
 
+## Building Options
+
+### DAC / DAC Key / PAI Certificate / Certificate Declaration
+
+Infineon CYW30739 examples use test certifications, keys, and CD by default. For
+a production build, manufacturers can provision certifications, keys, and CD by
+the following arguments:
+
+-   `matter_dac`, `matter_dac_key`, `matter_pai`, `matter_cd`
+
+    ```bash
+    $ ./scripts/examples/gn_build_example.sh examples/lighting-app/infineon/cyw30739 out/lighting-app \
+    'matter_dac="/path/to/dac.der"' \
+    'matter_dac_key="/path/to/dac_key.der"' \
+    'matter_pai="/path/to/pai.der"' \
+    'matter_cd="/path/to/cd.der"'
+    ```
+
 ## Flashing the Application
 
 ### Enter Recovery Mode

diff --git a/examples/lighting-app/infineon/cyw30739/include/CHIPProjectConfig.h b/examples/lighting-app/infineon/cyw30739/include/CHIPProjectConfig.h
@@ -34,13 +34,13 @@
 #define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_NAME "Infineon"
 
 /* The VendorID attribute of the Basic cluster. */
-#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0xFFF1
+#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0xFFF2
 
 /* The ProductName attribute of the Basic cluster. */
 #define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME "CYW30739 Lighting App"
 
 /* The ProductID attribute of the Basic cluster. */
-#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x8005
+#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x8002
 
 /* The HardwareVersionString attribute of the Basic cluster. */
 #define CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING "30739"

diff --git a/examples/lighting-app/infineon/cyw30739/src/main.cpp b/examples/lighting-app/infineon/cyw30739/src/main.cpp
@@ -35,6 +35,7 @@
 #include <lib/shell/Engine.h>
 #include <lib/support/CHIPPlatformMemory.h>
 #include <mbedtls/platform.h>
+#include <platform/Infineon/CYW30739/FactoryDataProvider.h>
 #include <protocols/secure_channel/PASESession.h>
 #include <sparcommon.h>
 #include <stdio.h>
@@ -47,6 +48,8 @@ using namespace ::chip::DeviceLayer;
 using namespace ::chip::Shell;
 
 static chip::DeviceLayer::DeviceInfoProviderImpl gExampleDeviceInfoProvider;
+static FactoryDataProvider sFactoryDataProvider;
+
 static void InitApp(intptr_t args);
 static void LightManagerCallback(LightingManager::Actor_t actor, LightingManager::Action_t action, uint8_t value);
 
@@ -196,7 +199,7 @@ void InitApp(intptr_t args)
     initParams.endpointNativeParams    = static_cast<void *>(&nativeParams);
     chip::Server::GetInstance().Init(initParams);
 
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+    SetDeviceAttestationCredentialsProvider(&sFactoryDataProvider);
 
     LightMgr().Init();
     LightMgr().SetCallbacks(LightManagerCallback, nullptr);

diff --git a/examples/lighting-app/infineon/cyw30739/static_config.txt b/examples/lighting-app/infineon/cyw30739/static_config.txt
diff --git a/examples/lock-app/infineon/cyw30739/README.md b/examples/lock-app/infineon/cyw30739/README.md
@@ -59,6 +59,24 @@ dataset and CASE credentials are then provided.
     $ rm -rf out/
     ```
 
+## Building Options
+
+### DAC / DAC Key / PAI Certificate / Certificate Declaration
+
+Infineon CYW30739 examples use test certifications, keys, and CD by default. For
+a production build, manufacturers can provision certifications, keys, and CD by
+the following arguments:
+
+-   `matter_dac`, `matter_dac_key`, `matter_pai`, `matter_cd`
+
+    ```bash
+    $ ./scripts/examples/gn_build_example.sh examples/lighting-app/infineon/cyw30739 out/lighting-app \
+    'matter_dac="/path/to/dac.der"' \
+    'matter_dac_key="/path/to/dac_key.der"' \
+    'matter_pai="/path/to/pai.der"' \
+    'matter_cd="/path/to/cd.der"'
+    ```
+
 ## Flashing the Application
 
 ### Enter Recovery Mode

diff --git a/examples/lock-app/infineon/cyw30739/include/CHIPProjectConfig.h b/examples/lock-app/infineon/cyw30739/include/CHIPProjectConfig.h
@@ -34,13 +34,13 @@
 #define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_NAME "Infineon"
 
 /* The VendorID attribute of the Basic cluster. */
-#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0xFFF1
+#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0xFFF2
 
 /* The ProductName attribute of the Basic cluster. */
 #define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME "CYW30739 Lock App"
 
 /* The ProductID attribute of the Basic cluster. */
-#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x8006
+#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x8002
 
 /* The HardwareVersionString attribute of the Basic cluster. */
 #define CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING "30739"

diff --git a/examples/lock-app/infineon/cyw30739/src/main.cpp b/examples/lock-app/infineon/cyw30739/src/main.cpp
@@ -38,6 +38,7 @@
 #include <lib/shell/Engine.h>
 #include <lib/support/CHIPPlatformMemory.h>
 #include <mbedtls/platform.h>
+#include <platform/Infineon/CYW30739/FactoryDataProvider.h>
 #include <protocols/secure_channel/PASESession.h>
 #include <sparcommon.h>
 #include <stdio.h>
@@ -60,6 +61,8 @@ using namespace CYW30739DoorLock::LockInitParams;
 wiced_bool_t syncClusterToButtonAction = false;
 
 static chip::DeviceLayer::DeviceInfoProviderImpl gExampleDeviceInfoProvider;
+static FactoryDataProvider sFactoryDataProvider;
+
 static void InitApp(intptr_t args);
 static void ActionInitiated(LockManager::Action_t aAction, int32_t aActor);
 static void ActionCompleted(LockManager::Action_t aAction);
@@ -193,7 +196,7 @@ void InitApp(intptr_t args)
     initParams.endpointNativeParams    = static_cast<void *>(&nativeParams);
     chip::Server::GetInstance().Init(initParams);
 
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+    SetDeviceAttestationCredentialsProvider(&sFactoryDataProvider);
 
     // Initial lock state
     chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> state;

diff --git a/examples/lock-app/infineon/cyw30739/static_config.txt b/examples/lock-app/infineon/cyw30739/static_config.txt
diff --git a/examples/ota-requestor-app/infineon/cyw30739/README.md b/examples/ota-requestor-app/infineon/cyw30739/README.md
@@ -60,6 +60,24 @@ dataset and CASE credentials are then provided.
     $ rm -rf out/
     ```
 
+## Building Options
+
+### DAC / DAC Key / PAI Certificate / Certificate Declaration
+
+Infineon CYW30739 examples use test certifications, keys, and CD by default. For
+a production build, manufacturers can provision certifications, keys, and CD by
+the following arguments:
+
+-   `matter_dac`, `matter_dac_key`, `matter_pai`, `matter_cd`
+
+    ```bash
+    $ ./scripts/examples/gn_build_example.sh examples/lighting-app/infineon/cyw30739 out/lighting-app \
+    'matter_dac="/path/to/dac.der"' \
+    'matter_dac_key="/path/to/dac_key.der"' \
+    'matter_pai="/path/to/pai.der"' \
+    'matter_cd="/path/to/cd.der"'
+    ```
+
 ## Flashing the Application
 
 ### Enter Recovery Mode

diff --git a/examples/ota-requestor-app/infineon/cyw30739/include/CHIPProjectConfig.h b/examples/ota-requestor-app/infineon/cyw30739/include/CHIPProjectConfig.h
@@ -34,13 +34,13 @@
 #define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_NAME "Infineon"
 
 /* The VendorID attribute of the Basic cluster. */
-#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0xFFF1
+#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0xFFF2
 
 /* The ProductName attribute of the Basic cluster. */
 #define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME "CYW30739 OTA Requestor App"
 
 /* The ProductID attribute of the Basic cluster. */
-#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x8008
+#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x8002
 
 /* The HardwareVersionString attribute of the Basic cluster. */
 #define CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING "30739"

diff --git a/examples/ota-requestor-app/infineon/cyw30739/src/main.cpp b/examples/ota-requestor-app/infineon/cyw30739/src/main.cpp
@@ -26,6 +26,7 @@
 #include <lib/shell/Engine.h>
 #include <lib/support/CHIPPlatformMemory.h>
 #include <mbedtls/platform.h>
+#include <platform/Infineon/CYW30739/FactoryDataProvider.h>
 #include <protocols/secure_channel/PASESession.h>
 #include <sparcommon.h>
 #include <stdio.h>
@@ -37,6 +38,8 @@ using namespace chip::Credentials;
 using namespace chip::DeviceLayer;
 using namespace chip::Shell;
 
+static FactoryDataProvider sFactoryDataProvider;
+
 static void InitApp(intptr_t args);
 
 APPLICATION_START()
@@ -123,7 +126,7 @@ void InitApp(intptr_t args)
     initParams.endpointNativeParams    = static_cast<void *>(&nativeParams);
     chip::Server::GetInstance().Init(initParams);
 
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+    SetDeviceAttestationCredentialsProvider(&sFactoryDataProvider);
 
     OTAConfig::Init();
 }
diff --git a/examples/ota-requestor-app/infineon/cyw30739/static_config.txt b/examples/ota-requestor-app/infineon/cyw30739/static_config.txt
diff --git a/scripts/requirements.infineon.txt b/scripts/requirements.infineon.txt
@@ -0,0 +1 @@
+leb128
diff --git a/scripts/requirements.txt b/scripts/requirements.txt
@@ -14,6 +14,9 @@ virtualenv
 # openiotsdk
 -r requirements.openiotsdk.txt
 
+# Infineon
+-r requirements.infineon.txt
+
 # cirque tests
 requests>=2.24.0
 

diff --git a/src/platform/Infineon/CYW30739/BUILD.gn b/src/platform/Infineon/CYW30739/BUILD.gn
@@ -39,6 +39,8 @@ static_library("CYW30739") {
     "ConnectivityManagerImpl.h",
     "DiagnosticDataProviderImpl.cpp",
     "DiagnosticDataProviderImpl.h",
+    "FactoryDataProvider.cpp",
+    "FactoryDataProvider.h",
     "InetPlatformConfig.h",
     "KeyValueStoreManagerImpl.cpp",
     "KeyValueStoreManagerImpl.h",
@@ -61,6 +63,12 @@ static_library("CYW30739") {
 
   deps = [ "${chip_root}/src/crypto" ]
 
+  public = [
+    "${chip_root}/src/credentials/DeviceAttestationCredsProvider.h",
+    "FactoryDataProvider.h",
+    "OTAImageProcessorImpl.h",
+  ]
+
   public_deps = [ "${chip_root}/src/platform:platform_base" ]
 
   if (chip_enable_openthread) {

diff --git a/src/platform/Infineon/CYW30739/CYW30739Config.cpp b/src/platform/Infineon/CYW30739/CYW30739Config.cpp
@@ -24,8 +24,6 @@
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
 #include <hal/wiced_hal_eflash.h>
-#include <platform/Infineon/CYW30739/CYW30739Config.h>
-#include <platform_nvram.h>
 
 namespace chip {
 namespace DeviceLayer {
@@ -58,10 +56,14 @@ CHIP_ERROR CYW30739Config::ReadConfigValueBin(Key key, uint8_t * buf, size_t buf
 CHIP_ERROR CYW30739Config::ReadConfigValueBin(Key key, void * buf, size_t bufSize, size_t & outLen)
 {
     wiced_result_t result;
-    uint16_t read_count = wiced_hal_read_nvram(PLATFORM_NVRAM_VSID_MATTER_BASE + key, bufSize, (uint8_t *) buf, &result);
-    if (kMinConfigKey_ChipFactory <= key && key <= kMaxConfigKey_ChipFactory && result != WICED_SUCCESS)
+    uint16_t read_count;
+    if (kMinConfigKey_ChipFactory <= key && key <= kMaxConfigKey_ChipFactory)
     {
-        read_count = wiced_hal_read_nvram_static(PLATFORM_NVRAM_SSID_MATTER_BASE + key, bufSize, buf, &result);
+        read_count = wiced_hal_read_nvram_static(key, bufSize, buf, &result);
+    }
+    else
+    {
+        read_count = wiced_hal_read_nvram(key, bufSize, (uint8_t *) buf, &result);
     }
     if (result == WICED_SUCCESS)
     {
@@ -124,7 +126,7 @@ CHIP_ERROR CYW30739Config::WriteConfigValueBin(Key key, const void * data, size_
     }
 
     wiced_result_t result;
-    const uint16_t write_count = wiced_hal_write_nvram(PLATFORM_NVRAM_VSID_MATTER_BASE + key, dataLen, (uint8_t *) data, &result);
+    const uint16_t write_count = wiced_hal_write_nvram(key, dataLen, (uint8_t *) data, &result);
     if (result == WICED_SUCCESS && write_count == dataLen)
         return CHIP_NO_ERROR;
 
@@ -135,7 +137,7 @@ CHIP_ERROR CYW30739Config::WriteConfigValueBin(Key key, const void * data, size_
 CHIP_ERROR CYW30739Config::ClearConfigValue(Key key)
 {
     wiced_result_t result;
-    wiced_hal_delete_nvram(PLATFORM_NVRAM_VSID_MATTER_BASE + key, &result);
+    wiced_hal_delete_nvram(key, &result);
     if (result == WICED_SUCCESS)
     {
         return CHIP_NO_ERROR;