From 730888e6e8b49084f589cf5e4c76083f2cff356c Mon Sep 17 00:00:00 2001
From: Devaraj Ranganna <devaraj.ranganna@arm.com>
Date: Wed, 13 Nov 2024 12:26:53 +0000
Subject: [PATCH] corepkcs11: Remove out-of-tree patch

Remove the upstreamed out-of-tree patch
`0001-Do-not-define-__PASTE-macro-for-Arm-compiler.patch` and update to
latest version of corePKCS11 library.

Signed-off-by: Devaraj Ranganna <devaraj.ranganna@arm.com>
---
 components/aws_iot/corepkcs11/CMakeLists.txt  |  6 ----
 ...efine-__PASTE-macro-for-Arm-compiler.patch | 32 -------------------
 components/aws_iot/corepkcs11/library         |  2 +-
 manifest.yml                                  |  2 +-
 4 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 components/aws_iot/corepkcs11/integration/patches/0001-Do-not-define-__PASTE-macro-for-Arm-compiler.patch

diff --git a/components/aws_iot/corepkcs11/CMakeLists.txt b/components/aws_iot/corepkcs11/CMakeLists.txt
index de667bb..07e4720 100644
--- 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/components/aws_iot/corepkcs11/integration/patches/0001-Do-not-define-__PASTE-macro-for-Arm-compiler.patch b/components/aws_iot/corepkcs11/integration/patches/0001-Do-not-define-__PASTE-macro-for-Arm-compiler.patch
deleted file mode 100644
index a501bf6..0000000
--- a/components/aws_iot/corepkcs11/integration/patches/0001-Do-not-define-__PASTE-macro-for-Arm-compiler.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b57c4407d6438e252ade2b753565da9fffc8f8b7 Mon Sep 17 00:00:00 2001
-From: Ahmed Ismail <Ahmed.Ismail@arm.com>
-Date: Tue, 2 Jul 2024 10:46:38 +0100
-Subject: [PATCH] Do not define __PASTE macro for Arm-compiler
-
-__PASTE macro is defined for Arm Compiler in its header files
-so to avoid conflicts it is undefined as it is already defined by
-corePkcs11 headers.
-
-Signed-off-by: Ahmed Ismail <Ahmed.Ismail@arm.com>
----
- source/include/core_pkcs11.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/source/include/core_pkcs11.h b/source/include/core_pkcs11.h
-index d8b84f7..6195f3f 100644
---- a/source/include/core_pkcs11.h
-+++ b/source/include/core_pkcs11.h
-@@ -197,8 +197,8 @@
- 
- /* Bring in the public header. */
- 
--/* Undefine the macro for Keil Compiler to avoid conflict */
--#if defined( __PASTE ) && defined( __CC_ARM )
-+/* Undefine the macro for Keil and ARMClang Compilers to avoid conflict */
-+#if defined( __PASTE ) && ( defined( __CC_ARM ) || defined( __ARMCC_VERSION ) )
-     /* ARM RCVT stdint.h has a duplicate definition with PKCS #11. */
-     #undef __PASTE
- #endif
--- 
-2.34.1
-
diff --git a/components/aws_iot/corepkcs11/library b/components/aws_iot/corepkcs11/library
index 781f577..8a4ac0e 160000
--- a/components/aws_iot/corepkcs11/library
+++ b/components/aws_iot/corepkcs11/library
@@ -1 +1 @@
-Subproject commit 781f5774948fa8e6427be544b1bf1ad512ae9e90
+Subproject commit 8a4ac0e0e27a83da5c2a5e8c87f34998f6eb7aaf
diff --git a/manifest.yml b/manifest.yml
index 93b46c4..a33ee93 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -106,7 +106,7 @@ dependencies:
     license: "MIT"
     tpip-category: "category-2"
     security-risk: "low"
-    version: "v3.5.0"
+    version: "8a4ac0e0e27a83da5c2a5e8c87f34998f6eb7aaf"
     repository:
       type: "git"
       url: "https://github.com/FreeRTOS/corePKCS11.git"