FreeRTOS · urutva · Nov 12, 2024 · Nov 13, 2024 · Nov 13, 2024
diff --git a/applications/freertos_iot_libraries_tests/CMakeLists.txt b/applications/freertos_iot_libraries_tests/CMakeLists.txt
@@ -79,7 +79,6 @@ target_link_libraries(freertos-libraries-integration-tests-config
         coremqtt
         helpers-logging
         freertos-libraries-integration-tests-mqtt
-        freertos-libraries-integration-tests-ota-pal
         freertos-libraries-integration-tests-qualification
         freertos-libraries-integration-tests-transport
         unity

diff --git a/applications/freertos_iot_libraries_tests/integration_tests_platform_function.c b/applications/freertos_iot_libraries_tests/integration_tests_platform_function.c
@@ -19,7 +19,6 @@
 
 #include "transport_interface_test.h"
 #include "qualification_test.h"
-#include "ota_pal_test.h"
 #include "mqtt_test.h"
 
 #include "demo_config.h"
@@ -128,11 +127,6 @@ void SetupMqttTestParam( MqttTestParam_t * pTestParam )
     }
 }
 
-void SetupOtaPalTestParam( OtaPalTestParam_t * pTestParam )
-{
-    pTestParam->pageSize = 4096;
-}
-
 typedef struct Task_t
 {
     TaskHandle_t handle;

diff --git a/applications/freertos_iot_libraries_tests/test_execution_config.h b/applications/freertos_iot_libraries_tests/test_execution_config.h
@@ -55,11 +55,6 @@
  */
 #define TRANSPORT_INTERFACE_TEST_ENABLED    ( 1 )
 
-/**
- * @brief Configuration to enable the OTA PAL test.
- */
-#define OTA_PAL_TEST_ENABLED                ( 1 )
-
 /**
  * @brief Configuration to enable the OTA End-to-end test.
  */

diff --git a/applications/freertos_iot_libraries_tests/test_param_config.h b/applications/freertos_iot_libraries_tests/test_param_config.h
@@ -186,35 +186,6 @@
  * #define TEST_START_DELAY_MS  5000
  */
 
-#define OTA_RSA_SHA1                                       1
-#define OTA_RSA_SHA256                                     2
-#define OTA_ECDSA_SHA256                                   3
-
-/**
- * @brief Certificate type for OTA PAL test.
- * Valid options are: OTA_RSA_SHA1, OTA_RSA_SHA256, OTA_ECDSA_SHA256.
- */
-#define OTA_PAL_TEST_CERT_TYPE                             OTA_RSA_SHA256
-
-/**
- * @brief Path to cert for OTA test PAL. Used to verify signature.
- * If applicable, the device must be pre-provisioned with this certificate. Please see
- * test/common/ota/test_files for the set of certificates.
- */
-#define OTA_PAL_CERTIFICATE_FILE                           "ecdsa-sha256-signer.crt.pem"
-
-/**
- * @brief Some devices have a hard-coded name for the firmware image to boot.
- */
-#define OTA_PAL_FIRMWARE_FILE                              "non_secure image"
-
-/**
- * @brief Some boards OTA PAL layers will use the file names passed into it for the
- * image and the certificates because their non-volatile memory is abstracted by a
- * file system. Set this to 1 if that is the case for your device.
- */
-#define OTA_PAL_USE_FILE_SYSTEM                            0
-
 /**
  * @brief The PKCS #11 supports RSA key function.
  *

diff --git a/applications/helpers/provisioning/CMakeLists.txt b/applications/helpers/provisioning/CMakeLists.txt
@@ -23,17 +23,10 @@ else()
         fri-bsp
     )
 
-    if(FREERTOS_LIBRARIES_INTEGRATION_TESTS EQUAL 1)
-        set(
-            CODE_SIGNING_PUBLIC_KEY_PEM_PATH
-            ${freertos_libraries_integration_tests_SOURCE_DIR}/src/ota/test_files/tfm-rsa-sha256-signer.crt.pem
-        )
-    else()
-        set(
-            CODE_SIGNING_PUBLIC_KEY_PEM_PATH
-            ${AWS_OTA_SIGNATURE_PUBLIC_KEY_PATH}
-        )
-    endif()
+    set(
+        CODE_SIGNING_PUBLIC_KEY_PEM_PATH
+        ${AWS_OTA_SIGNATURE_PUBLIC_KEY_PATH}
+    )
 
     add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/aws_clientcredential_keys.h
         DEPENDS ${AWS_CLIENT_PRIVATE_KEY_PEM_PATH}

diff --git a/components/aws_iot/corepkcs11/CMakeLists.txt b/components/aws_iot/corepkcs11/CMakeLists.txt
@@ -9,11 +9,5 @@ if(CMAKE_CROSSCOMPILING)
         "Path to corePKCS11 source code"
     )
 
-    include(ApplyPatches)
-
-    set(PATCH_FILES_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/integration/patches")
-    set(PATCH_FILES "${PATCH_FILES_DIRECTORY}/0001-Do-not-define-__PASTE-macro-for-Arm-compiler.patch")
-    iot_reference_arm_corstone3xx_apply_patches("${corepkcs11_SOURCE_DIR}" "${PATCH_FILES}")
-
     add_subdirectory(integration)
 endif()
diff --git a/...ot/corepkcs11/integration/patches/0001-Do-not-define-__PASTE-macro-for-Arm-compiler.patch b/...ot/corepkcs11/integration/patches/0001-Do-not-define-__PASTE-macro-for-Arm-compiler.patch
diff --git a/components/aws_iot/corepkcs11/library b/components/aws_iot/corepkcs11/library
diff --git a/components/security/mbedtls/CMakeLists.txt b/components/security/mbedtls/CMakeLists.txt
@@ -18,12 +18,6 @@ else ()
     set(ENABLE_PROGRAMS OFF CACHE BOOL "" FORCE)
     set(ENABLE_TESTING OFF CACHE BOOL "" FORCE)
 
-    include(ApplyPatches)
-
-    set(PATCH_FILES_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/integration/patches")
-    set(PATCH_FILES "${PATCH_FILES_DIRECTORY}/0001-md-Fix-guards-for-functions-and-headers.patch")
-    iot_reference_arm_corstone3xx_apply_patches("${mbedtls_SOURCE_DIR}" "${PATCH_FILES}")
-
     add_subdirectory(library)
 
     add_subdirectory(integration)

diff --git a/...s/security/mbedtls/integration/patches/0001-md-Fix-guards-for-functions-and-headers.patch b/...s/security/mbedtls/integration/patches/0001-md-Fix-guards-for-functions-and-headers.patch
diff --git a/components/tools/freertos_libraries_integration_tests/CMakeLists.txt b/components/tools/freertos_libraries_integration_tests/CMakeLists.txt
@@ -13,8 +13,6 @@ include(ApplyPatches)
 set(PATCH_FILES_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/integration/patches")
 set(PATCH_FILES
     "${PATCH_FILES_DIRECTORY}/0001-Reduce-the-TRANSPORT_TEST_BUFFER_WRITABLE_LENGTH.patch"
-    "${PATCH_FILES_DIRECTORY}/0002-closefile-validsignature-test-Fix-test-bugs.patch"
-    "${PATCH_FILES_DIRECTORY}/0003-Introduce-user-defined-MQTT-keep-alive-value.patch"
 )
 iot_reference_arm_corstone3xx_apply_patches("${freertos_libraries_integration_tests_SOURCE_DIR}" "${PATCH_FILES}")
 

diff --git a/components/tools/freertos_libraries_integration_tests/integration/CMakeLists.txt b/components/tools/freertos_libraries_integration_tests/integration/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(freertos-libraries-integration-tests-config INTERFACE)
 include(${freertos_libraries_integration_tests_SOURCE_DIR}/qualification_test.cmake)
 include(${freertos_libraries_integration_tests_SOURCE_DIR}/src/mqtt_test.cmake)
 include(${freertos_libraries_integration_tests_SOURCE_DIR}/src/pkcs11_test.cmake)
-include(${freertos_libraries_integration_tests_SOURCE_DIR}/src/ota_pal_test.cmake)
 include(${freertos_libraries_integration_tests_SOURCE_DIR}/src/transport_interface_test.cmake)
 
 add_library(freertos-libraries-integration-tests-mqtt
@@ -31,20 +30,6 @@ target_compile_definitions(freertos-libraries-integration-tests-mqtt
     PRIVATE
         MQTT_KEEP_ALIVE_INTERVAL_SECONDS=60
 )
-add_library(freertos-libraries-integration-tests-ota-pal
-    ${OTA_PAL_TEST_SOURCES}
-)
-target_include_directories(freertos-libraries-integration-tests-ota-pal
-    PUBLIC
-        ${OTA_PAL_TEST_INCLUDE_DIRS}
-)
-target_link_libraries(freertos-libraries-integration-tests-ota-pal
-    PRIVATE
-        freertos-libraries-integration-tests-config
-        freertos-ota-pal-psa
-        ota-for-aws-iot-embedded-sdk
-        unity
-)
 
 add_library(freertos-libraries-integration-tests-pkcs11
     ${PKCS11_TEST_SOURCES}
@@ -82,7 +67,6 @@ target_link_libraries(freertos-libraries-integration-tests-qualification
         coremqtt
         freertos-libraries-integration-tests-config
         freertos-libraries-integration-tests-mqtt
-        freertos-libraries-integration-tests-ota-pal
         freertos-libraries-integration-tests-pkcs11
 )
 

diff --git a/...egration_tests/integration/patches/0002-closefile-validsignature-test-Fix-test-bugs.patch b/...egration_tests/integration/patches/0002-closefile-validsignature-test-Fix-test-bugs.patch