diff --git a/applications/aws_iot_example/CMakeLists.txt b/applications/aws_iot_example/CMakeLists.txt index bf2563f8..91b52320 100644 --- a/applications/aws_iot_example/CMakeLists.txt +++ b/applications/aws_iot_example/CMakeLists.txt @@ -89,10 +89,8 @@ add_subdirectory(../helpers ${CMAKE_BINARY_DIR}/helpers) # Add main application executable add_executable(aws-iot-example - dev_mode_key_provisioning.c - main.c mqtt_demo_pub_sub.c - ${corepkcs11_SOURCE_DIR}/source/dependency/3rdparty/mbedtls_utils/mbedtls_utils.c + main.c ) target_include_directories(aws-iot-example PUBLIC @@ -121,6 +119,7 @@ target_link_libraries(aws-iot-example mbedtls mbedtls-threading-freertos ota-for-aws-iot-embedded-sdk + provisioning-lib tfm-ns-interface toolchain-override ) @@ -199,10 +198,8 @@ target_link_libraries(freertos-libraries-integration-tests-config # Add FreeRTOS Libraries Integration Tests application executable add_executable(aws-iot-example-tests - dev_mode_key_provisioning.c - main.c mqtt_demo_pub_sub.c - ${corepkcs11_SOURCE_DIR}/source/dependency/3rdparty/mbedtls_utils/mbedtls_utils.c + main.c ) target_include_directories(aws-iot-example-tests PUBLIC @@ -233,6 +230,7 @@ target_link_libraries(aws-iot-example-tests fri-bsp helpers-events ota-for-aws-iot-embedded-sdk + provisioning-lib mbedtls mbedtls-threading-freertos tfm-ns-interface diff --git a/applications/helpers/provisioning/CMakeLists.txt b/applications/helpers/provisioning/CMakeLists.txt index 674aebbc..1c1ac34c 100644 --- a/applications/helpers/provisioning/CMakeLists.txt +++ b/applications/helpers/provisioning/CMakeLists.txt @@ -70,3 +70,14 @@ target_elf_to_bin(provisioning_data provisioning_data) add_custom_target(provisioning_data_bin ALL SOURCES provisioning_data.bin ) + +add_library(provisioning-lib + dev_mode_key_provisioning.c + ${corepkcs11_SOURCE_DIR}/source/dependency/3rdparty/mbedtls_utils/mbedtls_utils.c +) + +target_link_libraries(provisioning-lib + corepkcs11 + freertos_kernel + mbedtls +) diff --git a/applications/aws_iot_example/dev_mode_key_provisioning.c b/applications/helpers/provisioning/dev_mode_key_provisioning.c similarity index 99% rename from applications/aws_iot_example/dev_mode_key_provisioning.c rename to applications/helpers/provisioning/dev_mode_key_provisioning.c index c7cc1517..e5d77d4b 100644 --- a/applications/aws_iot_example/dev_mode_key_provisioning.c +++ b/applications/helpers/provisioning/dev_mode_key_provisioning.c @@ -1342,7 +1342,7 @@ int xOtaProvisionCodeSigningKey( psa_key_handle_t * pxKeyHandle, { uint8_t pucPubKeyDerFormatBuffer[ DER_FORMAT_BUFFER_LENGTH ]; size_t xPubKeyDerLength = DER_FORMAT_BUFFER_LENGTH; - size_t xPubKeyPemLength = strlen( pxProvisioningParamsBundle->codeSigningPublicKey ); + size_t xPubKeyPemLength = strlen( ( const char * ) pxProvisioningParamsBundle->codeSigningPublicKey ); int result = 0; psa_status_t status = PSA_SUCCESS; psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT; diff --git a/applications/aws_iot_example/freertos_integration_tests/dev_mode_key_provisioning.h b/applications/helpers/provisioning/dev_mode_key_provisioning.h similarity index 100% rename from applications/aws_iot_example/freertos_integration_tests/dev_mode_key_provisioning.h rename to applications/helpers/provisioning/dev_mode_key_provisioning.h diff --git a/release_changes/202401041521.change b/release_changes/202401041521.change new file mode 100644 index 00000000..f403cfb9 --- /dev/null +++ b/release_changes/202401041521.change @@ -0,0 +1 @@ +provisioning: Share files between apps