Skip to content

Commit 4cc25d5

Browse files
[nrf toup][nrfconnect] Fixed factory data cert generation
Paths for the certificates are passed to factory data python script directly, and if the path contains cmake macro it is not expanded properly. Signed-off-by: Kamil Kasperczyk <[email protected]>
1 parent fa4f8bb commit 4cc25d5

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

config/nrfconnect/chip-module/generate_factory_data_sysbuild.cmake

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,12 @@ function(nrfconnect_create_factory_data factory_data_target script_path schema_p
118118
string(APPEND script_args "--dac_key \"${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/credentials/development/attestation/Matter-Development-DAC-${raw_vid_upper}-${raw_pid_upper}-Key.der\"\n")
119119
string(APPEND script_args "--pai_cert \"${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/credentials/development/attestation/Matter-Development-PAI-${raw_vid_upper}-noPID-Cert.der\"\n")
120120
elseif(CONFIG_CHIP_FACTORY_DATA_CERT_SOURCE_USER)
121-
string(APPEND script_args "--dac_cert \"${CONFIG_CHIP_FACTORY_DATA_USER_CERTS_DAC_CERT}\"\n")
122-
string(APPEND script_args "--dac_key \"${CONFIG_CHIP_FACTORY_DATA_USER_CERTS_DAC_KEY}\"\n")
123-
string(APPEND script_args "--pai_cert \"${CONFIG_CHIP_FACTORY_DATA_USER_CERTS_PAI_CERT}\"\n")
121+
string(CONFIGURE "${CONFIG_CHIP_FACTORY_DATA_USER_CERTS_DAC_CERT}" DAC_CERT)
122+
string(CONFIGURE "${CONFIG_CHIP_FACTORY_DATA_USER_CERTS_DAC_KEY}" DAC_KEY)
123+
string(CONFIGURE "${CONFIG_CHIP_FACTORY_DATA_USER_CERTS_PAI_CERT}" PAI_CERT)
124+
string(APPEND script_args "--dac_cert \"${DAC_CERT}\"\n")
125+
string(APPEND script_args "--dac_key \"${DAC_KEY}\"\n")
126+
string(APPEND script_args "--pai_cert \"${PAI_CERT}\"\n")
124127
elseif(CONFIG_CHIP_FACTORY_DATA_CERT_SOURCE_GENERATED)
125128
string(APPEND script_args "--gen_certs\n")
126129
endif()

0 commit comments

Comments
 (0)