components: Add patches for Jobs-for-AWS-IoT-embedded-sdk library

Two patches are added for the Jobs-for-AWS-IoT-embedded-sdk library:
- The Jobs library assumes the OTA job is signed using ECDSA. However,
we currently use RSA. Therefore, add a patch to change the check for an
ECDSA signature to a check for an RSA signature.
- The Jobs library contains calls to the `strnlen` function. However,
this function is not supported by the Arm Compiler for Embedded (v6.21).
Therefore, add a patch which replaces these calls with calls to our
custom implementation `app_strnlen`.

Signed-off-by: Chuyue Luo <[email protected]>

Author: chuyue-luo-arm

components/aws_iot/jobs_for_aws_iot_embedded_sdk/CMakeLists.txt

@@ -11,5 +11,14 @@ else()
         "Path to AWS IoT Jobs source code"
     )
 
+    include(ApplyPatches)
+
+    set(PATCH_FILES_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/integration/patches")
+    set(PATCH_FILES
+        "${PATCH_FILES_DIRECTORY}/0001-Check-for-RSA-signature-instead-of-ECDSA.patch"
+        "${PATCH_FILES_DIRECTORY}/0002-Use-custom-strnlen-implementation.patch"
+    )
+    iot_reference_arm_corstone3xx_apply_patches("${jobs-for-aws-iot-embedded-sdk_SOURCE_DIR}" "${PATCH_FILES}")
+
     add_subdirectory(integration)
 endif()

components/aws_iot/jobs_for_aws_iot_embedded_sdk/integration/patches/0001-Check-for-RSA-signature-instead-of-ECDSA.patch

@@ -0,0 +1,42 @@
+From 6ea98c733a2ea3c9d8cfdf4d3b689598ffdf8d54 Mon Sep 17 00:00:00 2001
+From: Chuyue Luo <[email protected]>
+Date: Wed, 4 Dec 2024 15:20:34 +0000
+Subject: [PATCH 1/2] Check for RSA signature instead of ECDSA
+
+The Jobs-for-AWS-IoT-embedded-sdk library assumes the OTA job is signed
+using ECDSA, but we currently use RSA. Thus, change the check for an
+ECDSA signature to a check for an RSA signature.
+
+Signed-off-by: Chuyue Luo <[email protected]>
+---
+ source/otaJobParser/job_parser.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/source/otaJobParser/job_parser.c b/source/otaJobParser/job_parser.c
+index 4a1da8a..8638dc0 100644
+--- a/source/otaJobParser/job_parser.c
++++ b/source/otaJobParser/job_parser.c
+@@ -1,6 +1,9 @@
+ /*
+  * AWS IoT Jobs v1.5.1
+  * Copyright (C) 2023 Amazon.com, Inc. and its affiliates. All Rights Reserved.
++ * Copyright 2024 Arm Limited and/or its affiliates
++ * <[email protected]>
++ *
+  * SPDX-License-Identifier: MIT
+  *
+  * Licensed under the MIT License. See the LICENSE accompanying this file
+@@ -263,8 +266,8 @@ static JSONStatus_t populateCommonFields( const char * jobDoc,
+     if( jsonResult == JSONSuccess )
+     {
+         buildIndexedFileQueryString( fileIndex,
+-                                     "sig-sha256-ecdsa",
+-                                     16U,
++                                     "sig-sha256-rsa",
++                                     14U,
+                                      queryString,
+                                      &queryStringLength );
+         jsonResult = JSON_SearchConst( jobDoc,
+-- 
+2.47.0
+

components/aws_iot/jobs_for_aws_iot_embedded_sdk/integration/patches/0002-Use-custom-strnlen-implementation.patch

@@ -0,0 +1,56 @@
+From 02b777ed41b393163c3f793d8ff3b608ac0b9634 Mon Sep 17 00:00:00 2001
+From: Chuyue Luo <[email protected]>
+Date: Wed, 4 Dec 2024 15:24:44 +0000
+Subject: [PATCH 2/2] Use custom `strnlen` implementation
+
+The Arm Compiler for Embedded (v6.21) does not support the `strnlen`
+function. Therefore, use our own implementation (`app_strnlen`) instead.
+
+Signed-off-by: Chuyue Luo <[email protected]>
+---
+ source/jobs.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/source/jobs.c b/source/jobs.c
+index 9614d90..0f83c27 100644
+--- a/source/jobs.c
++++ b/source/jobs.c
+@@ -1,6 +1,8 @@
+ /*
+  * AWS IoT Jobs v1.5.1
+  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
++ * Copyright 2024 Arm Limited and/or its affiliates
++ * <[email protected]>
+  *
+  * SPDX-License-Identifier: MIT
+  *
+@@ -36,6 +38,8 @@
+ /* External Dependencies */
+ #include "core_json.h"
+ 
++#include "app_strnlen.h"
++
+ /** @cond DO_NOT_DOCUMENT */
+ 
+ /**
+@@ -575,7 +579,7 @@ static bool isThingnameTopicMatch( const char * topic,
+         writePreamble( expectedTopicBuffer, &start, TOPIC_BUFFER_SIZE, thingName, ( uint16_t ) thingNameLength );
+         ( void ) strnAppend( expectedTopicBuffer, &start, TOPIC_BUFFER_SIZE, topicSuffix, topicSuffixLength );
+ 
+-        isMatch = ( size_t ) strnlen( expectedTopicBuffer, TOPIC_BUFFER_SIZE ) ==
++        isMatch = ( size_t ) app_strnlen( expectedTopicBuffer, TOPIC_BUFFER_SIZE ) ==
+                   topicLength;
+         isMatch = isMatch && ( strncmp( expectedTopicBuffer, topic, topicLength ) == 0 );
+     }
+@@ -894,7 +898,7 @@ bool Jobs_IsJobUpdateStatus( const char * topic,
+     ( void ) strnAppend( suffixBuffer, &start, suffixBufferLength, "/update/", ( CONST_STRLEN( "/update/" ) ) );
+     ( void ) strnAppend( suffixBuffer, &start, suffixBufferLength, jobUpdateStatusString[ expectedStatus ], jobUpdateStatusStringLengths[ expectedStatus ] );
+ 
+-    return isThingnameTopicMatch( topic, topicLength, suffixBuffer, strnlen( suffixBuffer, suffixBufferLength ), thingName, thingNameLength );
++    return isThingnameTopicMatch( topic, topicLength, suffixBuffer, app_strnlen( suffixBuffer, suffixBufferLength ), thingName, thingNameLength );
+ }
+ 
+ size_t Jobs_GetJobId( const char * message,
+-- 
+2.47.0
+