Skip to contentSkip to conversation

arm-bsp/corestone1000: update trusted-service patches for devtool

PATCH Applied Jon Mason 2 participants 2 messages Aug 1, 2022

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/1 arm-bsp/corestone1000: update trusted-service patches for devtool

Current secure-partitions patches do not apply cleanly with devtool. Update them with the necessary changes to address this issue, and regenerate them via devtool.

---
 ...n-applying-lowercase-project-conven.patch} |  16 +-
 ...0002-fix-EARLY_TA_PATHS-env-variable.patch |  17 +--
 ...0003-corstone1000-port-crypto-config.patch |   3 -
 ...proxy-dts-add-se-proxy-as-child-node.patch |  17 +--
 ...te-mm-comm-buffer-region-in-dts-file.patch |  18 +--
 .../0005-Configure-NV-storage-macro.patch     |  18 +--
 .../corstone1000/0006-Use-device-region.patch |  18 +--
 ...7-Add-openamp-to-SE-proxy-deployment.patch |  30 ++--
 ...iver-and-the-OpenAmp-conversion-laye.patch |  34 +++--
 .../0009-Add-openamp-rpc-caller.patch         |  55 ++++---
 ...-add-psa-client-definitions-for-ff-m.patch |  23 +--
 ...mon-service-component-to-ipc-support.patch |  30 ++--
 .../0012-Add-secure-storage-ipc-backend.patch |  33 ++--
 ...storage-ipc-and-openamp-for-se_proxy.patch |  18 +--
 ...d-uefi-variable-append-write-support.patch |  42 +++--
 ...riable-support-for-QueryVariableInfo.patch |  36 +++--
 .../0016-Add-uefi-test-deployment.patch       |  33 ++--
 ...-parameter-setting-in-sp-ffarpc_call.patch |  18 ++-
 ...-call-requests-with-no-shared-buffer.patch |  18 ++-
 .../corstone1000/0019-Run-psa-arch-test.patch |  23 ++-
 ...0020-Use-address-instead-of-pointers.patch |  21 ++-
 ...-Add-psa-ipc-attestation-to-se-proxy.patch |  29 ++--
 ...d-as-openamp-rpc-using-secure-storag.patch |  23 ++-
 .../0023-add-psa-ipc-crypto-backend.patch     |  73 +++++----
 ...MM-gateway-UEFI-variable-macro-value.patch |  15 +-
 ...ub-capsule-update-service-components.patch |  58 ++++---
 ...-logs-to-functions-in-SMM-gateway-SP.patch |  17 +--
 .../0027-Configure-storage-size.patch         |  14 +-
 ...d-uefi-variable-append-write-support.patch |  53 ++++---
 ...-Change-UID-of-variable-index-in-SMM.patch |  17 +--
 ...-Add-missing-features-to-setVariable.patch |  17 +--
 ...rameter-check-in-getNextVariableName.patch |  17 +--
 ...teway-add-checks-for-null-attributes.patch |  18 ++-
 .../0033-Enhance-mbedtls-fetch-process.patch  |  40 ++---
 ...x-format-specifier-in-logging_caller.patch |  20 +--
 ...for-mbedtls-and-psa-arch-tests-for-v.patch |  23 ++-
 ...n-verify-message-and-hash-operations.patch | 144 +++++++++---------
 ...nst-uninitialised-multi-part-transac.patch |  21 ++-
 ...038-Integrate-AEAD-operation-support.patch |  34 ++---
 ...eration-to-one-shot-cipher-operation.patch |  28 ++--
 ...-Fix-multi-part-termination-on-error.patch |  74 ++++-----
 ...tion-if-client-provided-buffer-is-to.patch |  17 +--
 ...g-to-updated-t_cose-version-fc3a4b2c.patch |  15 +-
 .../0043-pass-sysroot_yocto.patch             |  23 ++-
 ...face-structure-aligned-with-tf-m-cha.patch |  15 +-
 ...egrate-remaining-psa-ipc-client-APIs.patch |  42 ++---
 ...et_key_usage_flags-definition-to-the.patch |  20 +--
 ...-in-AEAD-for-psa-arch-test-54-and-58.patch |  40 ++---
 .../trusted-services/ts-corstone1000.inc      |   4 +-
 49 files changed, 749 insertions(+), 683 deletions(-)
 rename meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/{0001-tools-cmake-common-applying-lowercase-project-convention.patch => 0001-tools-cmake-common-applying-lowercase-project-conven.patch} (80%)
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0001-tools-cmake-common-applying-lowercase-project-conven.patch renamed from meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0001-tools-cmake-common-applying-lowercase-project-convention.patch +7 -9
similarity index 80%
rename from meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0001-tools-cmake-common-applying-lowercase-project-convention.patch
rename to meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0001-tools-cmake-common-applying-lowercase-project-conven.patch
index e48f4573..83c7b545 100644
@@ -1,7 +1,4 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Abdellatif El Khlifi <[email protected]>
-
-From 37559c70443fe85e246f1f652045f0cd3c78012b Mon Sep 17 00:00:00 2001
+From 73c27b917e15eb04f39eedac9b79e5011e8a754f Mon Sep 17 00:00:00 2001
 From: Vishnu Banavath <[email protected]>
 Date: Sat, 13 Nov 2021 07:47:44 +0000
 Subject: [PATCH] tools/cmake/common: applying lowercase project convention
@@ -11,12 +8,16 @@ source-code.
 Host build paths should not be lowercased. Otherwise, builds
 with uppercase paths will break.
 
+Upstream-Status: Pending [Not submitted to upstream yet]
 Signed-off-by: Abdellatif El Khlifi <[email protected]>
 
-%% original patch: 0001-tools-cmake-common-applying-lowercase-project-convention.patch
+
+---
+ tools/cmake/common/AddPlatform.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/tools/cmake/common/AddPlatform.cmake b/tools/cmake/common/AddPlatform.cmake
-index ae34c6e..31bcd8c 100644
+index ae34c6e4..31bcd8ca 100644
 --- a/tools/cmake/common/AddPlatform.cmake
 +++ b/tools/cmake/common/AddPlatform.cmake
 @@ -37,8 +37,8 @@ function(add_platform)
@@ -30,6 +31,3 @@ index ae34c6e..31bcd8c 100644
  	set(CMAKE_CONFIGURE_DEPENDS ${_platdef})
  
  	unset(TGT CACHE)
--- 
-2.25.1
-
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0002-fix-EARLY_TA_PATHS-env-variable.patch +8 -9
index a1af2aba..f56b4553 100644
@@ -1,7 +1,4 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Abdellatif El Khlifi <[email protected]>
-
-From a0673905e8f63877b631a29fab56ea42bf748549 Mon Sep 17 00:00:00 2001
+From 146f4dfa73aa316d611188f63e3530cffe9200af Mon Sep 17 00:00:00 2001
 From: Vishnu Banavath <[email protected]>
 Date: Sat, 13 Nov 2021 07:51:53 +0000
 Subject: [PATCH] fix EARLY_TA_PATHS env variable
@@ -11,11 +8,16 @@ EARLY_TA_PATHS should be set a separate rule for securepartitions
 to be included into optee-os image
 
 Signed-off-by: Vishnu Banavath <[email protected]>
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Abdellatif El Khlifi <[email protected]>
+
 
-%% original patch: 0002-fix-EARLY_TA_PATHS-env-variable.patch
+---
+ environments/opteesp/sp.mk.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/environments/opteesp/sp.mk.in b/environments/opteesp/sp.mk.in
-index c44ad59..d67e2dc 100644
+index c44ad59e..d67e2dca 100644
 --- a/environments/opteesp/sp.mk.in
 +++ b/environments/opteesp/sp.mk.in
 @@ -14,7 +14,8 @@ ifeq (,${@EXPORT_SP_UUID@-included})
@@ -28,6 +30,3 @@ index c44ad59..d67e2dc 100644
  TS_SP_DTSI_LIST+="\\n\#include \"${TS_INSTALL_PREFIX}/opteesp/manifest/@[email protected]\""
  else ifeq (fip,${SP_PACKAGING_METHOD})
  TS_SP_JSON_LIST+=${TS_INSTALL_PREFIX}/opteesp/json/@[email protected]
--- 
-2.25.1
-
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0003-corstone1000-port-crypto-config.patch +0 -3
index 1d7b8ae9..3b26b77a 100644
@@ -1,6 +1,3 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Emekcan Aras <[email protected]>
-
 From f86f5b42d853d2a65f6753362361bbb95aac1800 Mon Sep 17 00:00:00 2001
 From: Satish Kumar <[email protected]>
 Date: Sat, 11 Dec 2021 11:06:57 +0000
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0003-se-proxy-dts-add-se-proxy-as-child-node.patch +8 -9
index 3d50f931..bb4fc82e 100644
@@ -1,7 +1,4 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Abdellatif El Khlifi <[email protected]>
-
-From 77fa96b728b81066c440c2e1e185f745376a6fb2 Mon Sep 17 00:00:00 2001
+From 0ec1b3d20d612325b9c55baa2539d080eb6a72a8 Mon Sep 17 00:00:00 2001
 From: Vishnu Banavath <[email protected]>
 Date: Sat, 13 Nov 2021 08:34:42 +0000
 Subject: [PATCH] se-proxy:dts: add se-proxy as child node
@@ -10,11 +7,16 @@ se-proxy sp string should be added for se-proxy node to be
 read properly.
 
 Signed-off-by: Vishnu Banavath <[email protected]>
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Abdellatif El Khlifi <[email protected]>
+
 
-%% original patch: 0003-se-proxy-dts-add-se-proxy-as-child-node.patch
+---
+ .../se-proxy/opteesp/default_se-proxy.dts.in  | 20 ++++++++++---------
+ 1 file changed, 11 insertions(+), 9 deletions(-)
 
 diff --git a/deployments/se-proxy/opteesp/default_se-proxy.dts.in b/deployments/se-proxy/opteesp/default_se-proxy.dts.in
-index 961071a..9f5cf71 100644
+index 961071ad..9f5cf712 100644
 --- a/deployments/se-proxy/opteesp/default_se-proxy.dts.in
 +++ b/deployments/se-proxy/opteesp/default_se-proxy.dts.in
 @@ -7,13 +7,15 @@
@@ -42,6 +44,3 @@ index 961071a..9f5cf71 100644
 +		messaging-method = <0>; /* Direct messaging only */
 +	};
  };
--- 
-2.25.1
-
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0004-Update-mm-comm-buffer-region-in-dts-file.patch +9 -9
index a91355c0..9ceb176c 100644
@@ -1,15 +1,18 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Gowtham Suresh Kumar <[email protected]>
-
-From 1f75194e884a1795c3523f41dc0912dc5068e525 Mon Sep 17 00:00:00 2001
+From 97b4f3cd0216c30c39f6ece4f68d8faf3901fded Mon Sep 17 00:00:00 2001
 From: Gowtham Suresh Kumar <[email protected]>
 Date: Wed, 17 Nov 2021 15:31:09 +0000
 Subject: [PATCH] Update mm-comm-buffer region in dts file
 
-%% original patch: 0004-Update-mm-comm-buffer-region-in-dts-file.patch
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Gowtham Suresh Kumar <[email protected]>
+
+
+---
+ .../opteesp/default_smm-gateway.dts.in        | 35 ++++++++++---------
+ 1 file changed, 18 insertions(+), 17 deletions(-)
 
 diff --git a/deployments/smm-gateway/opteesp/default_smm-gateway.dts.in b/deployments/smm-gateway/opteesp/default_smm-gateway.dts.in
-index 0ad7878..183c38a 100644
+index 0ad7878b..183c38a7 100644
 --- a/deployments/smm-gateway/opteesp/default_smm-gateway.dts.in
 +++ b/deployments/smm-gateway/opteesp/default_smm-gateway.dts.in
 @@ -7,23 +7,24 @@
@@ -54,6 +57,3 @@ index 0ad7878..183c38a 100644
  		};
  	};
  };
--- 
-2.25.1
-
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0005-Configure-NV-storage-macro.patch +9 -9
index bdf71e68..8d2d62bf 100644
@@ -1,15 +1,18 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Gowtham Suresh Kumar <[email protected]>
-
-From 634b8e09e9c072b41dfe92e4ca08a685cac9e998 Mon Sep 17 00:00:00 2001
+From a11b23dd5f0c4124a5c6c2fcab0ea623bc76f4ba Mon Sep 17 00:00:00 2001
 From: Gowtham Suresh Kumar <[email protected]>
 Date: Wed, 17 Nov 2021 15:32:04 +0000
 Subject: [PATCH] Configure NV storage macro
 
-%% original patch: 0005-Configure-NV-storage-macro.patch
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Gowtham Suresh Kumar <[email protected]>
+
+
+---
+ deployments/smm-gateway/smm_gateway.c | 2 ++
+ 1 file changed, 2 insertions(+)
 
 diff --git a/deployments/smm-gateway/smm_gateway.c b/deployments/smm-gateway/smm_gateway.c
-index 4884a04..7828b3a 100644
+index 4884a040..7828b3af 100644
 --- a/deployments/smm-gateway/smm_gateway.c
 +++ b/deployments/smm-gateway/smm_gateway.c
 @@ -13,6 +13,8 @@
@@ -21,6 +24,3 @@ index 4884a04..7828b3a 100644
  /* Default to using the Protected Storage SP */
  #ifndef SMM_GATEWAY_NV_STORE_SN
  #define SMM_GATEWAY_NV_STORE_SN		"sn:ffa:751bf801-3dde-4768-a514-0f10aeed1790:0"
--- 
-2.25.1
-
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0006-Use-device-region.patch +9 -9
index 7087850b..eba1338e 100644
@@ -1,15 +1,18 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Gowtham Suresh Kumar <[email protected]>
-
-From 6bb7e118c15c97d4554a0a7f6d3fc8e9792ca65c Mon Sep 17 00:00:00 2001
+From ae22f5077d35e6acf3feb8a84a8ef7f599261b00 Mon Sep 17 00:00:00 2001
 From: Gowtham Suresh Kumar <[email protected]>
 Date: Wed, 17 Nov 2021 15:32:46 +0000
 Subject: [PATCH] Use device region
 
-%% original patch: 0006-Use-device-region.patch
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Gowtham Suresh Kumar <[email protected]>
+
+
+---
+ deployments/smm-gateway/opteesp/smm_gateway_sp.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/deployments/smm-gateway/opteesp/smm_gateway_sp.c b/deployments/smm-gateway/opteesp/smm_gateway_sp.c
-index 6f13885..0bc0902 100644
+index 6f138850..0bc09023 100644
 --- a/deployments/smm-gateway/opteesp/smm_gateway_sp.c
 +++ b/deployments/smm-gateway/opteesp/smm_gateway_sp.c
 @@ -10,7 +10,7 @@
@@ -48,6 +51,3 @@ index 6f13885..0bc0902 100644
  		goto fatal_error;
  
  	/* Attach SMM variable service to MM communication layer */
--- 
-2.25.1
-
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0007-Add-openamp-to-SE-proxy-deployment.patch +18 -12
index 06fb4979..eb51ef71 100644
@@ -1,7 +1,4 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Vishnu Banavath <[email protected]>
-
-From 8e25c9b4617dcbb5800b25ace93371d9bcd68e61 Mon Sep 17 00:00:00 2001
+From 90712f624c7b676e5b9a2d95cbe97d2b63fddcc9 Mon Sep 17 00:00:00 2001
 From: Vishnu Banavath <[email protected]>
 Date: Fri, 3 Dec 2021 16:36:51 +0000
 Subject: [PATCH] Add openamp to SE proxy deployment
@@ -14,10 +11,22 @@ and build it.
 Signed-off-by: Rui Miguel Silva <[email protected]>
 Signed-off-by: Vishnu Banavath <[email protected]>
 
-%% original patch: 0007-Add-openamp-to-SE-proxy-deployment.patch
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Vishnu Banavath <[email protected]>
+
+
+---
+ deployments/se-proxy/opteesp/CMakeLists.txt | 14 ++++
+ deployments/se-proxy/opteesp/lse.S          | 19 +++++
+ external/openamp/libmetal.cmake             | 81 ++++++++++++++++++++
+ external/openamp/openamp.cmake              | 82 +++++++++++++++++++++
+ 4 files changed, 196 insertions(+)
+ create mode 100644 deployments/se-proxy/opteesp/lse.S
+ create mode 100644 external/openamp/libmetal.cmake
+ create mode 100644 external/openamp/openamp.cmake
 
 diff --git a/deployments/se-proxy/opteesp/CMakeLists.txt b/deployments/se-proxy/opteesp/CMakeLists.txt
-index 4e2069a..248bd7e 100644
+index 4e2069a5..248bd7e3 100644
 --- a/deployments/se-proxy/opteesp/CMakeLists.txt
 +++ b/deployments/se-proxy/opteesp/CMakeLists.txt
 @@ -89,6 +89,7 @@ add_components(TARGET "se-proxy"
@@ -50,7 +59,7 @@ index 4e2069a..248bd7e 100644
  target_compile_definitions(se-proxy PRIVATE
 diff --git a/deployments/se-proxy/opteesp/lse.S b/deployments/se-proxy/opteesp/lse.S
 new file mode 100644
-index 0000000..840683a
+index 00000000..840683a6
 --- /dev/null
 +++ b/deployments/se-proxy/opteesp/lse.S
 @@ -0,0 +1,19 @@
@@ -75,7 +84,7 @@ index 0000000..840683a
 +
 diff --git a/external/openamp/libmetal.cmake b/external/openamp/libmetal.cmake
 new file mode 100644
-index 0000000..3a647e6
+index 00000000..3a647e69
 --- /dev/null
 +++ b/external/openamp/libmetal.cmake
 @@ -0,0 +1,81 @@
@@ -162,7 +171,7 @@ index 0000000..3a647e6
 +set_property(TARGET libmetal PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${LIBMETAL_INSTALL_PATH}/include")
 diff --git a/external/openamp/openamp.cmake b/external/openamp/openamp.cmake
 new file mode 100644
-index 0000000..aae13ba
+index 00000000..aae13bad
 --- /dev/null
 +++ b/external/openamp/openamp.cmake
 @@ -0,0 +1,82 @@
@@ -248,6 +257,3 @@ index 0000000..aae13ba
 +add_library(openamp STATIC IMPORTED)
 +set_property(TARGET openamp PROPERTY IMPORTED_LOCATION "${OPENAMP_INSTALL_PATH}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}open_amp${CMAKE_STATIC_LIBRARY_SUFFIX}")
 +set_property(TARGET openamp PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${OPENAMP_INSTALL_PATH}/include")
--- 
-2.25.1
-
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0008-Implement-mhu-driver-and-the-OpenAmp-conversion-laye.patch +21 -13
index f0930bdb..47ca59ff 100644
@@ -1,7 +1,4 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Vishnu Banavath <[email protected]>
-
-From 000f8beb8aaa70b1e9f805fd62b886f49b540251 Mon Sep 17 00:00:00 2001
+From 993a3c3cb08a723f5b5eb07cf38d70e9acf52e7f Mon Sep 17 00:00:00 2001
 From: Vishnu Banavath <[email protected]>
 Date: Fri, 3 Dec 2021 18:00:46 +0000
 Subject: [PATCH] Implement mhu driver and the OpenAmp conversion layer.
@@ -13,10 +10,24 @@ the secure enclave using OpenAmp.
 Signed-off-by: Rui Miguel Silva <[email protected]>
 Signed-off-by: Vishnu Banavath <[email protected]>
 
-%% original patch: 0008-Implement-mhu-driver-and-the-OpenAmp-conversion-laye.patch
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Vishnu Banavath <[email protected]>
+
+
+---
+ .../se-proxy/opteesp/default_se-proxy.dts.in  |  16 +
+ .../drivers/arm/mhu_driver/component.cmake    |  12 +
+ platform/drivers/arm/mhu_driver/mhu_v2.h      | 391 ++++++++++++
+ platform/drivers/arm/mhu_driver/mhu_v2_x.c    | 602 ++++++++++++++++++
+ .../providers/arm/corstone1000/platform.cmake |  10 +
+ 5 files changed, 1031 insertions(+)
+ create mode 100644 platform/drivers/arm/mhu_driver/component.cmake
+ create mode 100644 platform/drivers/arm/mhu_driver/mhu_v2.h
+ create mode 100644 platform/drivers/arm/mhu_driver/mhu_v2_x.c
+ create mode 100644 platform/providers/arm/corstone1000/platform.cmake
 
 diff --git a/deployments/se-proxy/opteesp/default_se-proxy.dts.in b/deployments/se-proxy/opteesp/default_se-proxy.dts.in
-index 9f5cf71..f351a59 100644
+index 9f5cf712..f351a592 100644
 --- a/deployments/se-proxy/opteesp/default_se-proxy.dts.in
 +++ b/deployments/se-proxy/opteesp/default_se-proxy.dts.in
 @@ -17,5 +17,21 @@
@@ -43,7 +54,7 @@ index 9f5cf71..f351a59 100644
  };
 diff --git a/platform/drivers/arm/mhu_driver/component.cmake b/platform/drivers/arm/mhu_driver/component.cmake
 new file mode 100644
-index 0000000..77a5a50
+index 00000000..77a5a50b
 --- /dev/null
 +++ b/platform/drivers/arm/mhu_driver/component.cmake
 @@ -0,0 +1,12 @@
@@ -61,7 +72,7 @@ index 0000000..77a5a50
 +)
 diff --git a/platform/drivers/arm/mhu_driver/mhu_v2.h b/platform/drivers/arm/mhu_driver/mhu_v2.h
 new file mode 100644
-index 0000000..2e4ba80
+index 00000000..2e4ba80f
 --- /dev/null
 +++ b/platform/drivers/arm/mhu_driver/mhu_v2.h
 @@ -0,0 +1,391 @@
@@ -458,7 +469,7 @@ index 0000000..2e4ba80
 +#endif /* __MHU_V2_X_H__ */
 diff --git a/platform/drivers/arm/mhu_driver/mhu_v2_x.c b/platform/drivers/arm/mhu_driver/mhu_v2_x.c
 new file mode 100644
-index 0000000..01d8f65
+index 00000000..01d8f659
 --- /dev/null
 +++ b/platform/drivers/arm/mhu_driver/mhu_v2_x.c
 @@ -0,0 +1,602 @@
@@ -1066,7 +1077,7 @@ index 0000000..01d8f65
 +}
 diff --git a/platform/providers/arm/corstone1000/platform.cmake b/platform/providers/arm/corstone1000/platform.cmake
 new file mode 100644
-index 0000000..bb778bb
+index 00000000..bb778bb9
 --- /dev/null
 +++ b/platform/providers/arm/corstone1000/platform.cmake
 @@ -0,0 +1,10 @@
@@ -1080,6 +1091,3 @@ index 0000000..bb778bb
 +
 +# include MHU driver
 +include(${TS_ROOT}/platform/drivers/arm/mhu_driver/component.cmake)
--- 
-2.25.1
-
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0009-Add-openamp-rpc-caller.patch +36 -19

129 lines not on this page · raw message

meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0010-add-psa-client-definitions-for-ff-m.patch +13 -10
index 95b2ae77..f41556a3 100644
@@ -1,7 +1,4 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Vishnu Banavath <[email protected]>
-
-From 0f32eaab3c1c5ef534139474b0453916bc4d8b63 Mon Sep 17 00:00:00 2001
+From 791a1302d7b779f3aeee7d6f7c9fac00b4244c1b Mon Sep 17 00:00:00 2001
 From: Vishnu Banavath <[email protected]>
 Date: Fri, 3 Dec 2021 19:05:18 +0000
 Subject: [PATCH] add psa client definitions for ff-m
@@ -12,11 +9,20 @@ ff-m support.
 Signed-off-by: Rui Miguel Silva <[email protected]>
 Signed-off-by: Vishnu Banavath <[email protected]>
 
-%% original patch: 0010-add-psa-client-definitions-for-ff-m.patch
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Vishnu Banavath <[email protected]>
+
+
+---
+ .../service/common/include/psa/client.h       | 194 ++++++++++++++++++
+ components/service/common/include/psa/sid.h   |  71 +++++++
+ 2 files changed, 265 insertions(+)
+ create mode 100644 components/service/common/include/psa/client.h
+ create mode 100644 components/service/common/include/psa/sid.h
 
 diff --git a/components/service/common/include/psa/client.h b/components/service/common/include/psa/client.h
 new file mode 100644
-index 0000000..69ccf14
+index 00000000..69ccf14f
 --- /dev/null
 +++ b/components/service/common/include/psa/client.h
 @@ -0,0 +1,194 @@
@@ -216,7 +222,7 @@ index 0000000..69ccf14
 +
 diff --git a/components/service/common/include/psa/sid.h b/components/service/common/include/psa/sid.h
 new file mode 100644
-index 0000000..aaa973c
+index 00000000..aaa973c6
 --- /dev/null
 +++ b/components/service/common/include/psa/sid.h
 @@ -0,0 +1,71 @@
@@ -291,6 +297,3 @@ index 0000000..aaa973c
 +#endif
 +
 +#endif /* __PSA_MANIFEST_SID_H__ */
--- 
-2.25.1
-
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0011-Add-common-service-component-to-ipc-support.patch +18 -12
index 1cbff68e..7ecb60f0 100644
@@ -1,7 +1,4 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Vishnu Banavath <[email protected]>
-
-From f08ec4e601e70669aafeb712d7c521cc07fd0c77 Mon Sep 17 00:00:00 2001
+From b7e9e6fc59263f5daf4ae79eb758fa7647058338 Mon Sep 17 00:00:00 2001
 From: Vishnu Banavath <[email protected]>
 Date: Fri, 3 Dec 2021 19:13:03 +0000
 Subject: [PATCH] Add common service component to ipc support
@@ -11,11 +8,23 @@ including, the openamp client side structures lib.
 
 Signed-off-by: Rui Miguel Silva <[email protected]>
 
-%% original patch: 0011-Add-common-service-component-to-ipc-support.patch
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Vishnu Banavath <[email protected]>
+
+
+---
+ .../service/common/psa_ipc/component.cmake    |  13 ++
+ .../service/common/psa_ipc/service_psa_ipc.c  |  97 +++++++++++++
+ .../psa_ipc/service_psa_ipc_openamp_lib.h     | 131 ++++++++++++++++++
+ deployments/se-proxy/opteesp/CMakeLists.txt   |   1 +
+ 4 files changed, 242 insertions(+)
+ create mode 100644 components/service/common/psa_ipc/component.cmake
+ create mode 100644 components/service/common/psa_ipc/service_psa_ipc.c
+ create mode 100644 components/service/common/psa_ipc/service_psa_ipc_openamp_lib.h
 
 diff --git a/components/service/common/psa_ipc/component.cmake b/components/service/common/psa_ipc/component.cmake
 new file mode 100644
-index 0000000..5a1c9e6
+index 00000000..5a1c9e62
 --- /dev/null
 +++ b/components/service/common/psa_ipc/component.cmake
 @@ -0,0 +1,13 @@
@@ -34,7 +43,7 @@ index 0000000..5a1c9e6
 +	)
 diff --git a/components/service/common/psa_ipc/service_psa_ipc.c b/components/service/common/psa_ipc/service_psa_ipc.c
 new file mode 100644
-index 0000000..e8093c2
+index 00000000..e8093c20
 --- /dev/null
 +++ b/components/service/common/psa_ipc/service_psa_ipc.c
 @@ -0,0 +1,97 @@
@@ -137,7 +146,7 @@ index 0000000..e8093c2
 +}
 diff --git a/components/service/common/psa_ipc/service_psa_ipc_openamp_lib.h b/components/service/common/psa_ipc/service_psa_ipc_openamp_lib.h
 new file mode 100644
-index 0000000..33ea966
+index 00000000..33ea9666
 --- /dev/null
 +++ b/components/service/common/psa_ipc/service_psa_ipc_openamp_lib.h
 @@ -0,0 +1,131 @@
@@ -273,7 +282,7 @@ index 0000000..33ea966
 +
 +
 diff --git a/deployments/se-proxy/opteesp/CMakeLists.txt b/deployments/se-proxy/opteesp/CMakeLists.txt
-index 1511bba..e0e0e12 100644
+index 1511bbad..e0e0e12b 100644
 --- a/deployments/se-proxy/opteesp/CMakeLists.txt
 +++ b/deployments/se-proxy/opteesp/CMakeLists.txt
 @@ -54,6 +54,7 @@ add_components(TARGET "se-proxy"
@@ -284,6 +293,3 @@ index 1511bba..e0e0e12 100644
  		"components/service/common/provider"
  		"components/service/discovery/provider"
  		"components/service/discovery/provider/serializer/packed-c"
--- 
-2.25.1
-
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0012-Add-secure-storage-ipc-backend.patch +20 -13
index acf98266..068468b8 100644
@@ -1,7 +1,4 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Vishnu Banavath <[email protected]>
-
-From 318f0dda8d258f0184a4d8650045e02be02afce2 Mon Sep 17 00:00:00 2001
+From 962056a9c8115e9228719d46b09da983678ab024 Mon Sep 17 00:00:00 2001
 From: Vishnu Banavath <[email protected]>
 Date: Fri, 3 Dec 2021 19:19:24 +0000
 Subject: [PATCH] Add secure storage ipc backend
@@ -11,10 +8,23 @@ openamp as rpc to communicate with other processor.
 
 Signed-off-by: Rui Miguel Silva <[email protected]>
 
-%% original patch: 0012-Add-secure-storage-ipc-backend.patch
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Vishnu Banavath <[email protected]>
+
+
+---
+ .../service/common/psa_ipc/service_psa_ipc.c  | 143 +++++++++++-
+ .../secure_storage_ipc/component.cmake        |  14 ++
+ .../secure_storage_ipc/secure_storage_ipc.c   | 214 ++++++++++++++++++
+ .../secure_storage_ipc/secure_storage_ipc.h   |  52 +++++
+ deployments/se-proxy/opteesp/CMakeLists.txt   |   1 +
+ 5 files changed, 420 insertions(+), 4 deletions(-)
+ create mode 100644 components/service/secure_storage/backend/secure_storage_ipc/component.cmake
+ create mode 100644 components/service/secure_storage/backend/secure_storage_ipc/secure_storage_ipc.c
+ create mode 100644 components/service/secure_storage/backend/secure_storage_ipc/secure_storage_ipc.h
 
 diff --git a/components/service/common/psa_ipc/service_psa_ipc.c b/components/service/common/psa_ipc/service_psa_ipc.c
-index e8093c2..95a07c1 100644
+index e8093c20..95a07c13 100644
 --- a/components/service/common/psa_ipc/service_psa_ipc.c
 +++ b/components/service/common/psa_ipc/service_psa_ipc.c
 @@ -16,6 +16,52 @@
@@ -203,7 +213,7 @@ index e8093c2..95a07c1 100644
  				&resp_len);
 diff --git a/components/service/secure_storage/backend/secure_storage_ipc/component.cmake b/components/service/secure_storage/backend/secure_storage_ipc/component.cmake
 new file mode 100644
-index 0000000..5d8f671
+index 00000000..5d8f6714
 --- /dev/null
 +++ b/components/service/secure_storage/backend/secure_storage_ipc/component.cmake
 @@ -0,0 +1,14 @@
@@ -223,7 +233,7 @@ index 0000000..5d8f671
 +
 diff --git a/components/service/secure_storage/backend/secure_storage_ipc/secure_storage_ipc.c b/components/service/secure_storage/backend/secure_storage_ipc/secure_storage_ipc.c
 new file mode 100644
-index 0000000..9b55f77
+index 00000000..9b55f77d
 --- /dev/null
 +++ b/components/service/secure_storage/backend/secure_storage_ipc/secure_storage_ipc.c
 @@ -0,0 +1,214 @@
@@ -443,7 +453,7 @@ index 0000000..9b55f77
 +}
 diff --git a/components/service/secure_storage/backend/secure_storage_ipc/secure_storage_ipc.h b/components/service/secure_storage/backend/secure_storage_ipc/secure_storage_ipc.h
 new file mode 100644
-index 0000000..e8c1e8f
+index 00000000..e8c1e8fd
 --- /dev/null
 +++ b/components/service/secure_storage/backend/secure_storage_ipc/secure_storage_ipc.h
 @@ -0,0 +1,52 @@
@@ -500,7 +510,7 @@ index 0000000..e8c1e8f
 +
 +#endif /* SECURE_STORAGE_IPC_H */
 diff --git a/deployments/se-proxy/opteesp/CMakeLists.txt b/deployments/se-proxy/opteesp/CMakeLists.txt
-index e0e0e12..663177b 100644
+index e0e0e12b..663177b7 100644
 --- a/deployments/se-proxy/opteesp/CMakeLists.txt
 +++ b/deployments/se-proxy/opteesp/CMakeLists.txt
 @@ -73,6 +73,7 @@ add_components(TARGET "se-proxy"
@@ -511,6 +521,3 @@ index e0e0e12..663177b 100644
  		"components/service/attestation/include"
  		"components/service/attestation/provider"
  		"components/service/attestation/provider/serializer/packed-c"
--- 
-2.25.1
-
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0013-Use-secure-storage-ipc-and-openamp-for-se_proxy.patch +9 -9
index fe7112c5..56964b5c 100644
@@ -1,7 +1,4 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Vishnu Banavath <[email protected]>
-
-From b8588aaefaef19ddd33abf57190501dc0d624587 Mon Sep 17 00:00:00 2001
+From 12b8b8bb28c96e6f121122939b7d23e6c7055f0f Mon Sep 17 00:00:00 2001
 From: Vishnu Banavath <[email protected]>
 Date: Fri, 3 Dec 2021 19:25:34 +0000
 Subject: [PATCH] Use secure storage ipc and openamp for se_proxy
@@ -12,10 +9,16 @@ openamp as rpc to secure enclave side.
 
 Signed-off-by: Rui Miguel Silva <[email protected]>
 
-%% original patch: 0013-Use-secure-storage-ipc-and-openamp-for-se_proxy.patch
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Vishnu Banavath <[email protected]>
+
+
+---
+ .../se-proxy/opteesp/service_proxy_factory.c     | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
 
 diff --git a/deployments/se-proxy/opteesp/service_proxy_factory.c b/deployments/se-proxy/opteesp/service_proxy_factory.c
-index acfb6e8..5729005 100644
+index acfb6e88..57290056 100644
 --- a/deployments/se-proxy/opteesp/service_proxy_factory.c
 +++ b/deployments/se-proxy/opteesp/service_proxy_factory.c
 @@ -6,15 +6,20 @@
@@ -58,6 +61,3 @@ index acfb6e8..5729005 100644
  
  	return secure_storage_provider_init(&ps_provider, backend);
  }
--- 
-2.25.1
-
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0014-Add-uefi-variable-append-write-support.patch +26 -16

103 lines not on this page · raw message

meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0015-Add-UEFI-variable-support-for-QueryVariableInfo.patch +22 -14
index 76493895..978600dd 100644
@@ -1,7 +1,4 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Vishnu Banavath <[email protected]>
-
-From 7cc8eaa66c6ecfd66a27317efd9b03725564a43a Mon Sep 17 00:00:00 2001
+From c4eaf83548eed4ed6194ff9e1368d6ae65f4ebf9 Mon Sep 17 00:00:00 2001
 From: Julian Hall <[email protected]>
 Date: Thu, 2 Dec 2021 17:27:55 +0000
 Subject: [PATCH] Add UEFI variable support for QueryVariableInfo
@@ -16,8 +13,22 @@ storage backend storage providers.
 Signed-off-by: Julian Hall <[email protected]>
 Change-Id: I971252831f7e478914d736c672d184a371e64502
 
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Vishnu Banavath <[email protected]>
+
+
+---
+ .../backend/test/variable_store_tests.cpp     |  89 +++++++-
+ .../backend/uefi_variable_store.c             | 213 ++++++++++++++----
+ .../backend/uefi_variable_store.h             |  39 +++-
+ .../client/cpp/smm_variable_client.cpp        |  66 ++++++
+ .../client/cpp/smm_variable_client.h          |   7 +
+ .../provider/smm_variable_provider.c          |  31 ++-
+ .../service/smm_variable_service_tests.cpp    |  55 ++++-
+ 7 files changed, 445 insertions(+), 55 deletions(-)
+
 diff --git a/components/service/smm_variable/backend/test/variable_store_tests.cpp b/components/service/smm_variable/backend/test/variable_store_tests.cpp
-index 578f118..e90c106 100644
+index 578f118f..e90c1067 100644
 --- a/components/service/smm_variable/backend/test/variable_store_tests.cpp
 +++ b/components/service/smm_variable/backend/test/variable_store_tests.cpp
 @@ -27,6 +27,18 @@ TEST_GROUP(UefiVariableStoreTests)
@@ -155,7 +166,7 @@ index 578f118..e90c106 100644
  
  TEST(UefiVariableStoreTests, removeVolatile)
 diff --git a/components/service/smm_variable/backend/uefi_variable_store.c b/components/service/smm_variable/backend/uefi_variable_store.c
-index bcb8599..ed50eaf 100644
+index bcb85995..ed50eaf9 100644
 --- a/components/service/smm_variable/backend/uefi_variable_store.c
 +++ b/components/service/smm_variable/backend/uefi_variable_store.c
 @@ -46,8 +46,15 @@ static efi_status_t load_variable_data(
@@ -524,7 +535,7 @@ index bcb8599..ed50eaf 100644
  	psa_status_t psa_status)
  {
 diff --git a/components/service/smm_variable/backend/uefi_variable_store.h b/components/service/smm_variable/backend/uefi_variable_store.h
-index fe0f24a..cc99206 100644
+index fe0f24af..cc992067 100644
 --- a/components/service/smm_variable/backend/uefi_variable_store.h
 +++ b/components/service/smm_variable/backend/uefi_variable_store.h
 @@ -20,6 +20,20 @@
@@ -600,7 +611,7 @@ index fe0f24a..cc99206 100644
  /**
   * @brief      Exit boot service
 diff --git a/components/service/smm_variable/client/cpp/smm_variable_client.cpp b/components/service/smm_variable/client/cpp/smm_variable_client.cpp
-index a68b7ac..8438285 100644
+index a68b7ace..8438285b 100644
 --- a/components/service/smm_variable/client/cpp/smm_variable_client.cpp
 +++ b/components/service/smm_variable/client/cpp/smm_variable_client.cpp
 @@ -219,6 +219,72 @@ efi_status_t smm_variable_client::get_next_variable_name(
@@ -677,7 +688,7 @@ index a68b7ac..8438285 100644
  	EFI_GUID &guid,
  	std::wstring &name,
 diff --git a/components/service/smm_variable/client/cpp/smm_variable_client.h b/components/service/smm_variable/client/cpp/smm_variable_client.h
-index 9c36c4e..c797391 100644
+index 9c36c4eb..c7973916 100644
 --- a/components/service/smm_variable/client/cpp/smm_variable_client.h
 +++ b/components/service/smm_variable/client/cpp/smm_variable_client.h
 @@ -63,6 +63,13 @@ public:
@@ -695,7 +706,7 @@ index 9c36c4e..c797391 100644
  	efi_status_t get_next_variable_name(
  		EFI_GUID &guid,
 diff --git a/components/service/smm_variable/provider/smm_variable_provider.c b/components/service/smm_variable/provider/smm_variable_provider.c
-index d239a42..52e68d0 100644
+index d239a428..52e68d09 100644
 --- a/components/service/smm_variable/provider/smm_variable_provider.c
 +++ b/components/service/smm_variable/provider/smm_variable_provider.c
 @@ -252,11 +252,38 @@ static rpc_status_t set_variable_handler(void *context, struct call_req* req)
@@ -740,7 +751,7 @@ index d239a42..52e68d0 100644
  
  static rpc_status_t exit_boot_service_handler(void *context, struct call_req* req)
 diff --git a/components/service/smm_variable/test/service/smm_variable_service_tests.cpp b/components/service/smm_variable/test/service/smm_variable_service_tests.cpp
-index 088940a..15556e9 100644
+index 088940a8..15556e9d 100644
 --- a/components/service/smm_variable/test/service/smm_variable_service_tests.cpp
 +++ b/components/service/smm_variable/test/service/smm_variable_service_tests.cpp
 @@ -335,12 +335,38 @@ TEST(SmmVariableServiceTests, setAndGetNv)
@@ -817,6 +828,3 @@ index 088940a..15556e9 100644
  	/* Enumerate store contents - expect the values we added */
  	std::wstring var_name;
  	EFI_GUID guid = {0};
--- 
-2.25.1
-
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0016-Add-uefi-test-deployment.patch +21 -12
index 9bc8f8a6..66a4499e 100644
@@ -1,7 +1,4 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Vishnu Banavath <[email protected]>
-
-From 409e2c5eeb4999852acbe22da346f018e30f15c0 Mon Sep 17 00:00:00 2001
+From 22120b4bd64da232e5a4e04a9a15376f34a933a3 Mon Sep 17 00:00:00 2001
 From: Julian Hall <[email protected]>
 Date: Mon, 6 Dec 2021 15:20:12 +0000
 Subject: [PATCH] Add uefi-test deployment
@@ -13,8 +10,23 @@ or any other similar secure-world uefi service provider.
 Signed-off-by: Julian Hall <[email protected]>
 Change-Id: Ic0e16dff51ef76ddd1f4dea37a4a55b029edd696
 
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Vishnu Banavath <[email protected]>
+
+
+---
+ .../ts-service-test/arm-linux/CMakeLists.txt  |  3 -
+ .../uefi-test/arm-linux/CMakeLists.txt        | 43 +++++++++++
+ deployments/uefi-test/linux-pc/CMakeLists.txt | 76 +++++++++++++++++++
+ deployments/uefi-test/uefi-test.cmake         | 52 +++++++++++++
+ tools/b-test/test_data.yaml                   | 10 +++
+ 5 files changed, 181 insertions(+), 3 deletions(-)
+ create mode 100644 deployments/uefi-test/arm-linux/CMakeLists.txt
+ create mode 100644 deployments/uefi-test/linux-pc/CMakeLists.txt
+ create mode 100644 deployments/uefi-test/uefi-test.cmake
+
 diff --git a/deployments/ts-service-test/arm-linux/CMakeLists.txt b/deployments/ts-service-test/arm-linux/CMakeLists.txt
-index 6a01d38..e902cd2 100644
+index 6a01d38a..e902cd2f 100644
 --- a/deployments/ts-service-test/arm-linux/CMakeLists.txt
 +++ b/deployments/ts-service-test/arm-linux/CMakeLists.txt
 @@ -23,9 +23,6 @@ add_components(
@@ -29,7 +41,7 @@ index 6a01d38..e902cd2 100644
  include(${TS_ROOT}/external/CppUTest/CppUTest.cmake)
 diff --git a/deployments/uefi-test/arm-linux/CMakeLists.txt b/deployments/uefi-test/arm-linux/CMakeLists.txt
 new file mode 100644
-index 0000000..053041a
+index 00000000..053041ad
 --- /dev/null
 +++ b/deployments/uefi-test/arm-linux/CMakeLists.txt
 @@ -0,0 +1,43 @@
@@ -78,7 +90,7 @@ index 0000000..053041a
 +target_link_libraries(uefi-test PRIVATE stdc++ gcc m)
 diff --git a/deployments/uefi-test/linux-pc/CMakeLists.txt b/deployments/uefi-test/linux-pc/CMakeLists.txt
 new file mode 100644
-index 0000000..be6e984
+index 00000000..be6e9840
 --- /dev/null
 +++ b/deployments/uefi-test/linux-pc/CMakeLists.txt
 @@ -0,0 +1,76 @@
@@ -160,7 +172,7 @@ index 0000000..be6e984
 +include(../uefi-test.cmake REQUIRED)
 diff --git a/deployments/uefi-test/uefi-test.cmake b/deployments/uefi-test/uefi-test.cmake
 new file mode 100644
-index 0000000..ea678d0
+index 00000000..ea678d0e
 --- /dev/null
 +++ b/deployments/uefi-test/uefi-test.cmake
 @@ -0,0 +1,52 @@
@@ -217,7 +229,7 @@ index 0000000..ea678d0
 +endif()
 +install(TARGETS uefi-test RUNTIME DESTINATION ${TS_ENV}/bin)
 diff --git a/tools/b-test/test_data.yaml b/tools/b-test/test_data.yaml
-index 11f8f63..33a85b1 100644
+index 11f8f633..33a85b12 100644
 --- a/tools/b-test/test_data.yaml
 +++ b/tools/b-test/test_data.yaml
 @@ -163,3 +163,13 @@ data:
@@ -234,6 +246,3 @@ index 11f8f63..33a85b1 100644
 +      os_id : "GNU/Linux"
 +      params:
 +          - "-GUnix Makefiles"
--- 
-2.25.1
-
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0017-Fix-interface-ID-parameter-setting-in-sp-ffarpc_call.patch +10 -8
index f0243618..9ad506b1 100644
@@ -1,7 +1,4 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Vishnu Banavath <[email protected]>
-
-From 5ea2bdc34efcbbd235091341027d86fd8d9ffb16 Mon Sep 17 00:00:00 2001
+From 289bec4cacac80cb43c19e4ca7b2c50fc932712e Mon Sep 17 00:00:00 2001
 From: Julian Hall <[email protected]>
 Date: Wed, 8 Dec 2021 11:48:28 +0000
 Subject: [PATCH] Fix interface ID parameter setting in sp/ffarpc_caller
@@ -13,8 +10,16 @@ This change fixes this issue.
 Signed-off-by: Julian Hall <[email protected]>
 Change-Id: Iab520e4c7dc63ee1f5d3bf1bd1de702e4cc6f093
 
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Vishnu Banavath <[email protected]>
+
+
+---
+ components/rpc/ffarpc/caller/sp/ffarpc_caller.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 diff --git a/components/rpc/ffarpc/caller/sp/ffarpc_caller.c b/components/rpc/ffarpc/caller/sp/ffarpc_caller.c
-index 250b178..dabcd90 100644
+index 250b1781..dabcd90c 100644
 --- a/components/rpc/ffarpc/caller/sp/ffarpc_caller.c
 +++ b/components/rpc/ffarpc/caller/sp/ffarpc_caller.c
 @@ -81,7 +81,7 @@ static rpc_status_t call_invoke(void *context, rpc_call_handle handle, uint32_t
@@ -26,6 +31,3 @@ index 250b178..dabcd90 100644
  	//TODO: downcast problem?
  	req.args[SP_CALL_ARGS_REQ_DATA_LEN] = (uint32_t)this_context->req_len;
  	req.args[SP_CALL_ARGS_ENCODING] = this_context->rpc_caller.encoding;
--- 
-2.25.1
-
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0018-Support-FFARPC-call-requests-with-no-shared-buffer.patch +10 -8
index 0ecbdfaa..6ea473b0 100644
@@ -1,7 +1,4 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Vishnu Banavath <[email protected]>
-
-From e3891ecaaa754eab74166bacea19f25dce060451 Mon Sep 17 00:00:00 2001
+From 18b20dea7cf7e8afc26c5d49d5368d3180bd54d7 Mon Sep 17 00:00:00 2001
 From: Julian Hall <[email protected]>
 Date: Wed, 8 Dec 2021 16:05:22 +0000
 Subject: [PATCH] Support FFARPC call requests with no shared buffer
@@ -14,8 +11,16 @@ when no shared buffer exists, as long as there is no request data.
 Signed-off-by: Julian Hall <[email protected]>
 Change-Id: I83b1bfb719a005922d6394887492d2d272b74907
 
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Vishnu Banavath <[email protected]>
+
+
+---
+ .../rpc/ffarpc/endpoint/ffarpc_call_ep.c      | 52 ++++++++++---------
+ 1 file changed, 27 insertions(+), 25 deletions(-)
+
 diff --git a/components/rpc/ffarpc/endpoint/ffarpc_call_ep.c b/components/rpc/ffarpc/endpoint/ffarpc_call_ep.c
-index 17f957c..a08a250 100644
+index 17f957c2..a08a250c 100644
 --- a/components/rpc/ffarpc/endpoint/ffarpc_call_ep.c
 +++ b/components/rpc/ffarpc/endpoint/ffarpc_call_ep.c
 @@ -150,29 +150,43 @@ out:
@@ -102,6 +107,3 @@ index 17f957c..a08a250 100644
 +		handle_service_msg(call_ep, source_id, req_args, resp_args);
  	}
  }
--- 
-2.25.1
-
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0019-Run-psa-arch-test.patch +11 -12
index f471d333..4f542158 100644
@@ -1,14 +1,16 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Satish Kumar <[email protected]>
-
-From 0059e7e18bff28a29c4f8a043d7f3d6d2b98ba7f Mon Sep 17 00:00:00 2001
+From a496978dcf82494c69e600f65adf061f15e565f4 Mon Sep 17 00:00:00 2001
 From: Satish Kumar <[email protected]>
 Date: Sun, 12 Dec 2021 10:43:48 +0000
-Subject: [PATCH 1/5] Run psa-arch-test
+Subject: [PATCH] Run psa-arch-test
 
 Fixes needed to run psa-arch-test
 
 Signed-off-by: Satish Kumar <[email protected]>
+
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Satish Kumar <[email protected]>
+
+
 ---
  components/service/common/psa_ipc/service_psa_ipc.c       | 1 +
  .../backend/secure_storage_ipc/secure_storage_ipc.c       | 8 --------
@@ -17,7 +19,7 @@ Signed-off-by: Satish Kumar <[email protected]>
  4 files changed, 4 insertions(+), 11 deletions(-)
 
 diff --git a/components/service/common/psa_ipc/service_psa_ipc.c b/components/service/common/psa_ipc/service_psa_ipc.c
-index 95a07c1..5e5815d 100644
+index 95a07c13..5e5815db 100644
 --- a/components/service/common/psa_ipc/service_psa_ipc.c
 +++ b/components/service/common/psa_ipc/service_psa_ipc.c
 @@ -185,6 +185,7 @@ psa_status_t psa_call(struct rpc_caller *caller, psa_handle_t psa_handle,
@@ -29,7 +31,7 @@ index 95a07c1..5e5815d 100644
  		       out_vec[i].len);
  	}
 diff --git a/components/service/secure_storage/backend/secure_storage_ipc/secure_storage_ipc.c b/components/service/secure_storage/backend/secure_storage_ipc/secure_storage_ipc.c
-index 9b55f77..a1f369d 100644
+index 9b55f77d..a1f369db 100644
 --- a/components/service/secure_storage/backend/secure_storage_ipc/secure_storage_ipc.c
 +++ b/components/service/secure_storage/backend/secure_storage_ipc/secure_storage_ipc.c
 @@ -31,10 +31,6 @@ static psa_status_t secure_storage_ipc_set(void *context, uint32_t client_id,
@@ -55,7 +57,7 @@ index 9b55f77..a1f369d 100644
  			      TFM_PS_GET_INFO, in_vec,
  			      IOVEC_LEN(in_vec), out_vec, IOVEC_LEN(out_vec));
 diff --git a/components/service/secure_storage/include/psa/storage_common.h b/components/service/secure_storage/include/psa/storage_common.h
-index 4f6ba2a..1fd6b40 100644
+index 4f6ba2a7..1fd6b40d 100644
 --- a/components/service/secure_storage/include/psa/storage_common.h
 +++ b/components/service/secure_storage/include/psa/storage_common.h
 @@ -20,8 +20,8 @@ typedef uint64_t psa_storage_uid_t;
@@ -70,7 +72,7 @@ index 4f6ba2a..1fd6b40 100644
  };
  
 diff --git a/external/openamp/openamp.cmake b/external/openamp/openamp.cmake
-index aae13ba..75ab229 100644
+index aae13bad..75ab2290 100644
 --- a/external/openamp/openamp.cmake
 +++ b/external/openamp/openamp.cmake
 @@ -61,7 +61,7 @@ execute_process(COMMAND
@@ -82,6 +84,3 @@ index aae13ba..75ab229 100644
  			${openamp_SOURCE_DIR}
  	WORKING_DIRECTORY
  			${openamp_BINARY_DIR}
--- 
-2.17.1
-
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0020-Use-address-instead-of-pointers.patch +10 -11
index 92d39c51..844bca3c 100644
@@ -1,10 +1,7 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Satish Kumar <[email protected]>
-
-From 1974cdc2a0a4f3395131570d4080ffc1ddde4990 Mon Sep 17 00:00:00 2001
+From b417c1124af9d4569ba8871dfd1e43e626dddf12 Mon Sep 17 00:00:00 2001
 From: Satish Kumar <[email protected]>
 Date: Sun, 12 Dec 2021 10:57:17 +0000
-Subject: [PATCH 2/5] Use address instead of pointers
+Subject: [PATCH] Use address instead of pointers
 
 Since secure enclave is 32bit and we 64bit there is an issue
 in the protocol communication design that force us to handle
@@ -13,6 +10,11 @@ this work.
 
 Signed-off-by: Rui Miguel Silva <[email protected]>
 Signed-off-by: Satish Kumar <[email protected]>
+
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Satish Kumar <[email protected]>
+
+
 ---
  .../service/common/include/psa/client.h       | 15 ++++++++++++++
  .../service/common/psa_ipc/service_psa_ipc.c  | 20 ++++++++++++-------
@@ -20,7 +22,7 @@ Signed-off-by: Satish Kumar <[email protected]>
  3 files changed, 38 insertions(+), 17 deletions(-)
 
 diff --git a/components/service/common/include/psa/client.h b/components/service/common/include/psa/client.h
-index 69ccf14..12dcd68 100644
+index 69ccf14f..12dcd68f 100644
 --- a/components/service/common/include/psa/client.h
 +++ b/components/service/common/include/psa/client.h
 @@ -81,6 +81,21 @@ struct __attribute__ ((__packed__)) psa_outvec {
@@ -46,7 +48,7 @@ index 69ccf14..12dcd68 100644
  
  /**
 diff --git a/components/service/common/psa_ipc/service_psa_ipc.c b/components/service/common/psa_ipc/service_psa_ipc.c
-index 5e5815d..435c6c0 100644
+index 5e5815db..435c6c0a 100644
 --- a/components/service/common/psa_ipc/service_psa_ipc.c
 +++ b/components/service/common/psa_ipc/service_psa_ipc.c
 @@ -62,6 +62,11 @@ static size_t psa_call_out_vec_len(const struct psa_outvec *out_vec, size_t out_
@@ -103,7 +105,7 @@ index 5e5815d..435c6c0 100644
  	}
  
 diff --git a/components/service/secure_storage/backend/secure_storage_ipc/secure_storage_ipc.c b/components/service/secure_storage/backend/secure_storage_ipc/secure_storage_ipc.c
-index a1f369d..bda442a 100644
+index a1f369db..bda442a6 100644
 --- a/components/service/secure_storage/backend/secure_storage_ipc/secure_storage_ipc.c
 +++ b/components/service/secure_storage/backend/secure_storage_ipc/secure_storage_ipc.c
 @@ -22,9 +22,9 @@ static psa_status_t secure_storage_ipc_set(void *context, uint32_t client_id,
@@ -165,6 +167,3 @@ index a1f369d..bda442a 100644
  	};
  
  	(void)client_id;
--- 
-2.17.1
-
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0021-Add-psa-ipc-attestation-to-se-proxy.patch +14 -15
index 23b38dae..5376bb22 100644
@@ -1,16 +1,18 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Rui Miguel Silva <[email protected]>
-
-From 20bab8442387480d77cf5d7c8271758acf9ed181 Mon Sep 17 00:00:00 2001
+From 259300dc81b95ff65cd2e95e0fecd140d76e4b5e Mon Sep 17 00:00:00 2001
 From: Rui Miguel Silva <[email protected]>
 Date: Tue, 7 Dec 2021 11:50:00 +0000
-Subject: [PATCH 3/5] Add psa ipc attestation to se proxy
+Subject: [PATCH] Add psa ipc attestation to se proxy
 
 Implement attestation client API as psa ipc and include it to
 se proxy deployment.
 
 Signed-off-by: Rui Miguel Silva <[email protected]>
 Signed-off-by: Satish Kumar <[email protected]>
+
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Rui Miguel Silva <[email protected]>
+
+
 ---
  .../client/psa_ipc/component.cmake            | 13 +++
  .../client/psa_ipc/iat_ipc_client.c           | 86 +++++++++++++++++++
@@ -27,7 +29,7 @@ Signed-off-by: Satish Kumar <[email protected]>
 
 diff --git a/components/service/attestation/client/psa_ipc/component.cmake b/components/service/attestation/client/psa_ipc/component.cmake
 new file mode 100644
-index 0000000..a5bc6b4
+index 00000000..a5bc6b4a
 --- /dev/null
 +++ b/components/service/attestation/client/psa_ipc/component.cmake
 @@ -0,0 +1,13 @@
@@ -46,7 +48,7 @@ index 0000000..a5bc6b4
 +	)
 diff --git a/components/service/attestation/client/psa_ipc/iat_ipc_client.c b/components/service/attestation/client/psa_ipc/iat_ipc_client.c
 new file mode 100644
-index 0000000..30bd0a1
+index 00000000..30bd0a13
 --- /dev/null
 +++ b/components/service/attestation/client/psa_ipc/iat_ipc_client.c
 @@ -0,0 +1,86 @@
@@ -138,7 +140,7 @@ index 0000000..30bd0a1
 +}
 diff --git a/components/service/attestation/reporter/psa_ipc/component.cmake b/components/service/attestation/reporter/psa_ipc/component.cmake
 new file mode 100644
-index 0000000..b37830c
+index 00000000..b37830c6
 --- /dev/null
 +++ b/components/service/attestation/reporter/psa_ipc/component.cmake
 @@ -0,0 +1,13 @@
@@ -157,7 +159,7 @@ index 0000000..b37830c
 +	)
 diff --git a/components/service/attestation/reporter/psa_ipc/psa_ipc_attest_report.c b/components/service/attestation/reporter/psa_ipc/psa_ipc_attest_report.c
 new file mode 100644
-index 0000000..15805e8
+index 00000000..15805e8e
 --- /dev/null
 +++ b/components/service/attestation/reporter/psa_ipc/psa_ipc_attest_report.c
 @@ -0,0 +1,45 @@
@@ -207,7 +209,7 @@ index 0000000..15805e8
 +	(void)report;
 +}
 diff --git a/components/service/common/include/psa/sid.h b/components/service/common/include/psa/sid.h
-index aaa973c..833f503 100644
+index aaa973c6..833f5039 100644
 --- a/components/service/common/include/psa/sid.h
 +++ b/components/service/common/include/psa/sid.h
 @@ -50,6 +50,10 @@ extern "C" {
@@ -222,7 +224,7 @@ index aaa973c..833f503 100644
  #define TFM_FWU_WRITE_SID                                          (0x000000A0U)
  #define TFM_FWU_WRITE_VERSION                                      (1U)
 diff --git a/deployments/se-proxy/opteesp/CMakeLists.txt b/deployments/se-proxy/opteesp/CMakeLists.txt
-index 663177b..af2225e 100644
+index 663177b7..af2225e7 100644
 --- a/deployments/se-proxy/opteesp/CMakeLists.txt
 +++ b/deployments/se-proxy/opteesp/CMakeLists.txt
 @@ -77,12 +77,13 @@ add_components(TARGET "se-proxy"
@@ -241,7 +243,7 @@ index 663177b..af2225e 100644
  		"components/service/crypto/backend/stub"
  		"components/service/crypto/client/psa"
 diff --git a/deployments/se-proxy/opteesp/service_proxy_factory.c b/deployments/se-proxy/opteesp/service_proxy_factory.c
-index 5729005..4b8ccec 100644
+index 57290056..4b8ccecc 100644
 --- a/deployments/se-proxy/opteesp/service_proxy_factory.c
 +++ b/deployments/se-proxy/opteesp/service_proxy_factory.c
 @@ -23,12 +23,18 @@ struct openamp_caller openamp;
@@ -263,6 +265,3 @@ index 5729005..4b8ccec 100644
  
  	attest_provider_register_serializer(&attest_provider,
  		TS_RPC_ENCODING_PACKED_C, packedc_attest_provider_serializer_instance());
--- 
-2.17.1
-
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0022-Setup-its-backend-as-openamp-rpc-using-secure-storag.patch +11 -12
index b7151691..aa389d8b 100644
@@ -1,14 +1,16 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Satish Kumar <[email protected]>
-
-From 53d5b73b84deb7feb4f87f2792f50fc8018ac0d5 Mon Sep 17 00:00:00 2001
+From 90006cecbbba58afee5f51e6bd72f7027a257b5e Mon Sep 17 00:00:00 2001
 From: Satish Kumar <[email protected]>
 Date: Thu, 9 Dec 2021 14:11:06 +0000
-Subject: [PATCH 4/5] Setup its backend as openamp rpc using secure storage ipc
+Subject: [PATCH] Setup its backend as openamp rpc using secure storage ipc
  implementation.
 
 Signed-off-by: Rui Miguel Silva <[email protected]>
 Signed-off-by: Satish Kumar <[email protected]>
+
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Satish Kumar <[email protected]>
+
+
 ---
  components/service/common/include/psa/sid.h   | 12 +++++-----
  .../secure_storage_ipc/secure_storage_ipc.c   | 20 ++++++++---------
@@ -17,7 +19,7 @@ Signed-off-by: Satish Kumar <[email protected]>
  4 files changed, 32 insertions(+), 23 deletions(-)
 
 diff --git a/components/service/common/include/psa/sid.h b/components/service/common/include/psa/sid.h
-index 833f503..4a951d4 100644
+index 833f5039..4a951d4a 100644
 --- a/components/service/common/include/psa/sid.h
 +++ b/components/service/common/include/psa/sid.h
 @@ -20,12 +20,12 @@ extern "C" {
@@ -40,7 +42,7 @@ index 833f503..4a951d4 100644
  /******** TFM_SP_ITS ********/
  #define TFM_INTERNAL_TRUSTED_STORAGE_SERVICE_SID                   (0x00000070U)
 diff --git a/components/service/secure_storage/backend/secure_storage_ipc/secure_storage_ipc.c b/components/service/secure_storage/backend/secure_storage_ipc/secure_storage_ipc.c
-index bda442a..0e1b48c 100644
+index bda442a6..0e1b48c0 100644
 --- a/components/service/secure_storage/backend/secure_storage_ipc/secure_storage_ipc.c
 +++ b/components/service/secure_storage/backend/secure_storage_ipc/secure_storage_ipc.c
 @@ -31,8 +31,8 @@ static psa_status_t secure_storage_ipc_set(void *context, uint32_t client_id,
@@ -99,7 +101,7 @@ index bda442a..0e1b48c 100644
  	if (psa_status != PSA_SUCCESS)
  		EMSG("ipc_get_support: failed to psa_call: %d", psa_status);
 diff --git a/components/service/secure_storage/backend/secure_storage_ipc/secure_storage_ipc.h b/components/service/secure_storage/backend/secure_storage_ipc/secure_storage_ipc.h
-index e8c1e8f..d9949f6 100644
+index e8c1e8fd..d9949f6a 100644
 --- a/components/service/secure_storage/backend/secure_storage_ipc/secure_storage_ipc.h
 +++ b/components/service/secure_storage/backend/secure_storage_ipc/secure_storage_ipc.h
 @@ -21,6 +21,7 @@ struct secure_storage_ipc
@@ -111,7 +113,7 @@ index e8c1e8f..d9949f6 100644
  
  /**
 diff --git a/deployments/se-proxy/opteesp/service_proxy_factory.c b/deployments/se-proxy/opteesp/service_proxy_factory.c
-index 4b8ccec..1110ac4 100644
+index 4b8ccecc..1110ac46 100644
 --- a/deployments/se-proxy/opteesp/service_proxy_factory.c
 +++ b/deployments/se-proxy/opteesp/service_proxy_factory.c
 @@ -5,6 +5,7 @@
@@ -160,6 +162,3 @@ index 4b8ccec..1110ac4 100644
 + 
 +        return secure_storage_provider_init(&its_provider, backend);
  }
--- 
-2.17.1
-
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0023-add-psa-ipc-crypto-backend.patch +36 -37

261 lines not on this page · raw message

meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0024-Increase-SMM-gateway-UEFI-variable-macro-value.patch +7 -8
index 00f80efb..91207bdd 100644
@@ -1,7 +1,4 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Gowtham Suresh Kumar <[email protected]>
-
-From 9b9261f73f93a5ac7ad823da376858b56560a08b Mon Sep 17 00:00:00 2001
+From 8fca2a8eed6ebc1cbf9f7972c6a9bb137ebafe1a Mon Sep 17 00:00:00 2001
 From: Gowtham Suresh Kumar <[email protected]>
 Date: Sun, 12 Dec 2021 17:07:03 +0000
 Subject: [PATCH] Increase SMM gateway UEFI variable macro value
@@ -12,12 +9,17 @@ or read SMM gateway returns error code. Currently this value is
 increased to 100 to support more UEFI variables.
 
 Signed-off-by: Gowtham Suresh Kumar <[email protected]>
+
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Gowtham Suresh Kumar <[email protected]>
+
+
 ---
  deployments/smm-gateway/smm_gateway.c | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/deployments/smm-gateway/smm_gateway.c b/deployments/smm-gateway/smm_gateway.c
-index 7828b3a..7e6729e 100644
+index 7828b3af..7e6729ee 100644
 --- a/deployments/smm-gateway/smm_gateway.c
 +++ b/deployments/smm-gateway/smm_gateway.c
 @@ -20,6 +20,9 @@
@@ -30,6 +32,3 @@ index 7828b3a..7e6729e 100644
  /* Default maximum number of UEFI variables */
  #ifndef SMM_GATEWAY_MAX_UEFI_VARIABLES
  #define SMM_GATEWAY_MAX_UEFI_VARIABLES		(40)
--- 
-2.17.1
-
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0025-Add-stub-capsule-update-service-components.patch +39 -19

138 lines not on this page · raw message

meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0026-Add-logs-to-functions-in-SMM-gateway-SP.patch +7 -10
index 1f465867..38ce2439 100644
@@ -1,21 +1,21 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Gowtham Suresh Kumar <[email protected]>
-
-From 9dc09450180d2d35b61359399c1313a97016ad07 Mon Sep 17 00:00:00 2001
+From c9188e59fd27d208a975187da285a9b5938bb00d Mon Sep 17 00:00:00 2001
 From: Gowtham Suresh Kumar <[email protected]>
 Date: Thu, 16 Dec 2021 13:29:58 +0000
 Subject: [PATCH] Add logs to functions in SMM gateway SP
 
 Signed-off-by: Gowtham Suresh Kumar <[email protected]>
 
-%% original patch: 0026-Logging.patch
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Gowtham Suresh Kumar <[email protected]>
+
+
 ---
  .../backend/uefi_variable_store.c             | 29 +++++++++++++++++--
  .../provider/smm_variable_provider.c          |  7 +++--
  2 files changed, 32 insertions(+), 4 deletions(-)
 
 diff --git a/components/service/smm_variable/backend/uefi_variable_store.c b/components/service/smm_variable/backend/uefi_variable_store.c
-index ed50eaf..0c371e9 100644
+index ed50eaf9..0c371e94 100644
 --- a/components/service/smm_variable/backend/uefi_variable_store.c
 +++ b/components/service/smm_variable/backend/uefi_variable_store.c
 @@ -11,6 +11,7 @@
@@ -206,7 +206,7 @@ index ed50eaf..0c371e9 100644
  			if (psa_status == PSA_SUCCESS) total_used += storage_info.size;
  		}
 diff --git a/components/service/smm_variable/provider/smm_variable_provider.c b/components/service/smm_variable/provider/smm_variable_provider.c
-index 52e68d0..1f362c1 100644
+index 52e68d09..1f362c17 100644
 --- a/components/service/smm_variable/provider/smm_variable_provider.c
 +++ b/components/service/smm_variable/provider/smm_variable_provider.c
 @@ -9,6 +9,7 @@
@@ -246,6 +246,3 @@ index 52e68d0..1f362c1 100644
  			}
  		}
  		else {
--- 
-2.17.1
-
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0027-Configure-storage-size.patch +6 -8
index 764cfe6c..ddf95034 100644
@@ -1,17 +1,18 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Gowtham Suresh Kumar <[email protected]>
-
-From 02746a26472f6aa7d57cfd5388823b0ec3c8a945 Mon Sep 17 00:00:00 2001
+From 3e472452bca64ed90071b61416460f1a69382293 Mon Sep 17 00:00:00 2001
 From: Gowtham Suresh Kumar <[email protected]>
 Date: Thu, 16 Dec 2021 21:31:40 +0000
 Subject: [PATCH] Configure storage size
 
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Gowtham Suresh Kumar <[email protected]>
+
+
 ---
  .../service/smm_variable/backend/uefi_variable_store.c       | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/components/service/smm_variable/backend/uefi_variable_store.c b/components/service/smm_variable/backend/uefi_variable_store.c
-index 0c371e9..b7cfff4 100644
+index 0c371e94..b7cfff40 100644
 --- a/components/service/smm_variable/backend/uefi_variable_store.c
 +++ b/components/service/smm_variable/backend/uefi_variable_store.c
 @@ -87,6 +87,7 @@ static efi_status_t check_name_terminator(
@@ -38,6 +39,3 @@ index 0c371e9..b7cfff4 100644
  	context->volatile_store.storage_backend = volatile_store;
  
  	context->owner_id = owner_id;
--- 
-2.17.1
-
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0028-Revert-Add-uefi-variable-append-write-support.patch +26 -27

180 lines not on this page · raw message

meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0029-Change-UID-of-variable-index-in-SMM.patch +7 -10
index fe31f8f2..caa1d9a9 100644
@@ -1,23 +1,23 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Gowtham Suresh Kumar <[email protected]>
-
-From 451eac3ed36231380b8e3dd0ad76c1a3c010a375 Mon Sep 17 00:00:00 2001
+From 12e9b977e4c7515ce90fecc62630be394fd7da62 Mon Sep 17 00:00:00 2001
 From: Gowtham Suresh Kumar <[email protected]>
 Date: Mon, 20 Dec 2021 19:54:39 +0000
-Subject: [PATCH 1/3] Change UID of variable index in SMM
+Subject: [PATCH] Change UID of variable index in SMM
 
 This patch fixes the os_indications setVariable() failure. The variable
 index UID in SMM gateway which was 1 is changed in this patch. TFM has a
 special usage for variable with UID 1, which makes it write once only.
 This is not required for SMM variable index.
 
-%% original patch: 0029-Change-UID-of-variable-index-in-SMM.patch
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Gowtham Suresh Kumar <[email protected]>
+
+
 ---
  components/service/smm_variable/backend/uefi_variable_store.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/components/service/smm_variable/backend/uefi_variable_store.c b/components/service/smm_variable/backend/uefi_variable_store.c
-index 6a90f46..1bb869a 100644
+index 6a90f46a..1bb869ae 100644
 --- a/components/service/smm_variable/backend/uefi_variable_store.c
 +++ b/components/service/smm_variable/backend/uefi_variable_store.c
 @@ -67,7 +67,7 @@ static efi_status_t check_name_terminator(
@@ -29,6 +29,3 @@ index 6a90f46..1bb869a 100644
  
  /* Default maximum variable size -
   * may be overridden using uefi_variable_store_set_storage_limits()
--- 
-2.17.1
-
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0030-Add-missing-features-to-setVariable.patch +7 -10
index a5828ca3..244146a2 100644
@@ -1,10 +1,7 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Gowtham Suresh Kumar <[email protected]>
-
-From 2ba5fa76a886e0ef59656fe96666f2582e8ffc72 Mon Sep 17 00:00:00 2001
+From 55fc3dbfb0ec21b1239808d0dddae14fbb8bb5f3 Mon Sep 17 00:00:00 2001
 From: Gowtham Suresh Kumar <[email protected]>
 Date: Mon, 20 Dec 2021 19:56:30 +0000
-Subject: [PATCH 2/3] Add missing features to setVariable()
+Subject: [PATCH] Add missing features to setVariable()
 
 This patch resolves the failing tests in SCT related to
 setVariable() function. The existing implementation is
@@ -12,13 +9,16 @@ missing few cases where error codes are returned when called
 with certain paramters. These conditions are implemented in
 this patch based on the explanation provided in uefi spec.
 
-%% original patch: 0030-Add-missing-features-to-setVariable.patch
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Gowtham Suresh Kumar <[email protected]>
+
+
 ---
  .../backend/uefi_variable_store.c             | 29 ++++++++++++++++---
  1 file changed, 25 insertions(+), 4 deletions(-)
 
 diff --git a/components/service/smm_variable/backend/uefi_variable_store.c b/components/service/smm_variable/backend/uefi_variable_store.c
-index 1bb869a..a167107 100644
+index 1bb869ae..a1671074 100644
 --- a/components/service/smm_variable/backend/uefi_variable_store.c
 +++ b/components/service/smm_variable/backend/uefi_variable_store.c
 @@ -161,6 +161,17 @@ efi_status_t uefi_variable_store_set_variable(
@@ -71,6 +71,3 @@ index 1bb869a..a167107 100644
  			status = EFI_INVALID_PARAMETER;
  		}
  	}
--- 
-2.17.1
-
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0031-Add-invalid-parameter-check-in-getNextVariableName.patch +7 -10
index 63a45a07..3990d82c 100644
@@ -1,10 +1,7 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Gowtham Suresh Kumar <[email protected]>
-
-From 8a2a47d360e43004d277c00ed06cbc59ccfb721e Mon Sep 17 00:00:00 2001
+From dc3f134436ad6852f1bad9542232e84166843a7e Mon Sep 17 00:00:00 2001
 From: Gowtham Suresh Kumar <[email protected]>
 Date: Mon, 20 Dec 2021 20:01:10 +0000
-Subject: [PATCH 3/3] Add invalid parameter check in getNextVariableName()
+Subject: [PATCH] Add invalid parameter check in getNextVariableName()
 
 This patch resolves the failing tests in SCT related to
 getNextVariableName() function. The existing implementation is
@@ -12,13 +9,16 @@ missing few cases where error codes are returned when called
 with certain paramters. These conditions are implemented in
 this patch based on the explanation provided in uefi spec.
 
-%% original patch: 0031-Add-invalid-parameter-check-in-getNextVariableName.patch
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Gowtham Suresh Kumar <[email protected]>
+
+
 ---
  .../smm_variable/backend/uefi_variable_store.c | 18 +++++++++++++++++-
  1 file changed, 17 insertions(+), 1 deletion(-)
 
 diff --git a/components/service/smm_variable/backend/uefi_variable_store.c b/components/service/smm_variable/backend/uefi_variable_store.c
-index a167107..a57b334 100644
+index a1671074..a57b3346 100644
 --- a/components/service/smm_variable/backend/uefi_variable_store.c
 +++ b/components/service/smm_variable/backend/uefi_variable_store.c
 @@ -161,7 +161,7 @@ efi_status_t uefi_variable_store_set_variable(
@@ -53,6 +53,3 @@ index a167107..a57b334 100644
  	const struct variable_info *info = variable_index_find_next(
  		&context->variable_index,
  		&cur->Guid,
--- 
-2.17.1
-
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0032-smm_gateway-add-checks-for-null-attributes.patch +10 -8
index 31f86f1d..da3ddaf6 100644
@@ -1,7 +1,4 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Vishnu Banavath <[email protected]>
-
-From c88937f3fb2d1259b1abb1a6926e869bf2f5d69e Mon Sep 17 00:00:00 2001
+From 571ddac16048dfba4b25b04fe5cbd706c392b5ba Mon Sep 17 00:00:00 2001
 From: Vishnu Banavath <[email protected]>
 Date: Fri, 24 Dec 2021 19:17:17 +0000
 Subject: [PATCH] smm_gateway: add checks for null attributes
@@ -13,8 +10,16 @@ This change is to add that support
 
 Signed-off-by: Vishnu Banavath <[email protected]>
 
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Vishnu Banavath <[email protected]>
+
+
+---
+ .../backend/uefi_variable_store.c             | 28 ++++++++++++-------
+ 1 file changed, 18 insertions(+), 10 deletions(-)
+
 diff --git a/components/service/smm_variable/backend/uefi_variable_store.c b/components/service/smm_variable/backend/uefi_variable_store.c
-index a57b334..e8771c2 100644
+index a57b3346..e8771c21 100644
 --- a/components/service/smm_variable/backend/uefi_variable_store.c
 +++ b/components/service/smm_variable/backend/uefi_variable_store.c
 @@ -167,7 +167,9 @@ efi_status_t uefi_variable_store_set_variable(
@@ -74,6 +79,3 @@ index a57b334..e8771c2 100644
  			/* Don't permit change of attributes */
  			status = EFI_INVALID_PARAMETER;
  		}
--- 
-2.17.1
-
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0033-Enhance-mbedtls-fetch-process.patch +20 -20
index 60f48262..02130b56 100644
@@ -1,10 +1,7 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Emekcan Aras <[email protected]>
-
-From ddff15a07e2fb7eddfa1d988fce25d82cb22f7ee Mon Sep 17 00:00:00 2001
+From 47db072e9ec749c6be7c0a27d64d7fbd75748d60 Mon Sep 17 00:00:00 2001
 From: Gyorgy Szing <[email protected]>
 Date: Wed, 8 Dec 2021 04:20:34 +0100
-Subject: [PATCH 01/15] Enhance mbedtls fetch process
+Subject: [PATCH] Enhance mbedtls fetch process
 
 Update management of MbedTLS external component to be optimized
 for download speed insted of availability.
@@ -30,6 +27,11 @@ used later to speed up a clean build an use the prebuilt binary.
 
 Change-Id: I8a9ad8b3303e6dfa0a7c9c3d7e4b4787b94d925a
 Signed-off-by: Gyorgy Szing <[email protected]>
+
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Emekcan Aras <[email protected]>
+
+
 ---
  external/MbedTLS/MbedTLS.cmake | 192 ++++++++++++++++++++-------------
  1 file changed, 119 insertions(+), 73 deletions(-)
@@ -46,7 +48,7 @@ index 3cbaed15..935be765 100644
  # SPDX-License-Identifier: BSD-3-Clause
  #
  #-------------------------------------------------------------------------------
-
+ 
 -# Determine the number of processes to run while running parallel builds.
 -# Pass -DPROCESSOR_COUNT=<n> to cmake to override.
 -if(NOT DEFINED PROCESSOR_COUNT)
@@ -62,7 +64,7 @@ index 3cbaed15..935be765 100644
 +		CACHE PATH "MbedTLS source directory")
 +set(MBEDTLS_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/mbedtls_install"
 +		CACHE PATH "Mbed TLS installation directory")
-
+ 
 -set(MBEDTLS_URL "https://github.com/ARMmbed/mbedtls.git" CACHE STRING "Mbed TLS repository URL")
 -set(MBEDTLS_REFSPEC "mbedtls-3.0.0" CACHE STRING "Mbed TLS git refspec")
 -set(MBEDTLS_INSTALL_PATH "${CMAKE_CURRENT_BINARY_DIR}/mbedtls_install" CACHE PATH "Mbed TLS installation directory")
@@ -74,18 +76,18 @@ index 3cbaed15..935be765 100644
 +				DOC "Location of mberdrypto library."
 +				NO_DEFAULT_PATH
 +)
-
+ 
 -include(FetchContent)
 +set(MBEDCRYPTO_LIB_FILE ${MBEDCRYPTO_LIB_FILE})
 +unset(MBEDCRYPTO_LIB_FILE CACHE)
-
+ 
 -# Checking git
 -find_program(GIT_COMMAND "git")
 -if (NOT GIT_COMMAND)
 -	message(FATAL_ERROR "Please install git")
 -endif()
 +set(MBEDTLS_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/_deps/mbedtls-build")
-
+ 
 -# Fetching Mbed TLS
 -FetchContent_Declare(
 -	mbedtls
@@ -103,7 +105,7 @@ index 3cbaed15..935be765 100644
 +		set(PROCESSOR_COUNT ${PROCESSOR_COUNT}
 +				CACHE STRING "Number of cores to use for parallel builds.")
 +	endif()
-
+ 
 -# FetchContent_GetProperties exports mbedtls_SOURCE_DIR and mbedtls_BINARY_DIR variables
 -FetchContent_GetProperties(mbedtls)
 -if(NOT mbedtls_POPULATED)
@@ -119,14 +121,14 @@ index 3cbaed15..935be765 100644
 +	)
 +	set(MBEDCRYPTO_HEADER_FILE ${MBEDCRYPTO_HEADER_FILE})
 +	unset(MBEDCRYPTO_HEADER_FILE CACHE)
-
+ 
 -# Convert the include path list to a string. Needed to make parameter passing to
 -# Mbed TLS build work fine.
 -string(REPLACE ";" "\\;" MBEDTLS_EXTRA_INCLUDES "${MBEDTLS_EXTRA_INCLUDES}")
 +	# Source not found, fetch it.
 +	if (NOT MBEDCRYPTO_HEADER_FILE)
 +		include(FetchContent)
-
+ 
 -find_package(Python3 COMPONENTS Interpreter)
 -if (NOT Python3_Interpreter_FOUND)
 -	message(FATAL_ERROR "Python 3 interpreter not found.")
@@ -136,7 +138,7 @@ index 3cbaed15..935be765 100644
 +		if (NOT GIT_COMMAND)
 +			message(FATAL_ERROR "Please install git")
 +		endif()
-
+ 
 -#Configure Mbed TLS to build only mbedcrypto lib
 -execute_process(COMMAND ${Python3_EXECUTABLE} scripts/config.py crypto WORKING_DIRECTORY ${mbedtls_SOURCE_DIR})
 -
@@ -169,7 +171,7 @@ index 3cbaed15..935be765 100644
 +			GIT_TAG ${MBEDTLS_REFSPEC}
 +			GIT_SHALLOW TRUE
 +		)
-
+ 
 -if (_exec_error)
 -	message(FATAL_ERROR "Configuration step of Mbed TLS failed with ${_exec_error}.")
 -endif()
@@ -182,7 +184,7 @@ index 3cbaed15..935be765 100644
 +
 +		# If the source directory has been moved, the binary dir must be regenerated from scratch.
 +		file(REMOVE_RECURSE "${MBEDTLS_BINARY_DIR}")
-
+ 
 -#TODO: add dependency to generated project on this file!
 -#TODO: add custom target to rebuild Mbed TLS
 +		if (NOT mbedtls_POPULATED)
@@ -191,7 +193,7 @@ index 3cbaed15..935be765 100644
 +		endif()
 +		set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${MBEDTLS_SOURCE_DIR})
 +	endif()
-
+ 
 -#Build the library
 -execute_process(COMMAND
 -		${CMAKE_COMMAND} --build ${mbedtls_BINARY_DIR} --parallel ${PROCESSOR_COUNT} --target install
@@ -246,7 +248,7 @@ index 3cbaed15..935be765 100644
 +
 +	set(MBEDCRYPTO_LIB_FILE "${MBEDTLS_INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}mbedcrypto${CMAKE_STATIC_LIBRARY_SUFFIX}")
  endif()
-
+ 
  #Create an imported target to have clean abstraction in the build-system.
  add_library(mbedcrypto STATIC IMPORTED)
 -set_property(TARGET mbedcrypto PROPERTY IMPORTED_LOCATION "${MBEDTLS_INSTALL_PATH}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}mbedcrypto${CMAKE_STATIC_LIBRARY_SUFFIX}")
@@ -254,5 +256,3 @@ index 3cbaed15..935be765 100644
 +set_property(DIRECTORY ${CMAKE_SOURCE_DIR} APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${MBEDCRYPTO_LIB_FILE})
 +set_property(TARGET mbedcrypto PROPERTY IMPORTED_LOCATION ${MBEDCRYPTO_LIB_FILE})
 +set_property(TARGET mbedcrypto PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${MBEDTLS_INSTALL_DIR}/include")
---
-2.25.1
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0034-Fix-format-specifier-in-logging_caller.patch +10 -10
index 019d3c24..75fa7c2a 100644
@@ -1,10 +1,7 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Emekcan Aras <[email protected]>
-
-From ba99622ba2f0048159bea2d0086173b8d5365473 Mon Sep 17 00:00:00 2001
+From 131bb3c577fff93ff9ba6f5e7d450f727fec0e62 Mon Sep 17 00:00:00 2001
 From: Julian Hall <[email protected]>
 Date: Fri, 11 Feb 2022 12:30:45 +0000
-Subject: [PATCH 02/15] Fix format specifier in logging_caller
+Subject: [PATCH] Fix format specifier in logging_caller
 
 A previous change increased the width of the opstatus value
 returned by an rpc endpoint from 32 to 64 bits. This change
@@ -13,6 +10,11 @@ that corresponds to logging the opstatus value.
 
 Signed-off-by: Julian Hall <[email protected]>
 Change-Id: Ie695a6bf8cf8014317b85196d7b933d344782b2c
+
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Emekcan Aras <[email protected]>
+
+
 ---
  components/rpc/common/logging/logging_caller.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
@@ -29,13 +31,11 @@ index 07c33de5..cac03f2f 100644
   * SPDX-License-Identifier: BSD-3-Clause
   */
 @@ -87,7 +87,7 @@ static rpc_status_t call_invoke(void *context, rpc_call_handle handle, uint32_t
-
+ 
  	if (status == TS_RPC_CALL_ACCEPTED) {
-
+ 
 -		fprintf(this_instance->log_file, "op_status: %d\n", *opstatus);
 +		fprintf(this_instance->log_file, "op_status: %ld\n", *opstatus);
  		fprintf(this_instance->log_file, "resp_len: %ld\n", *resp_len);
  	}
-
---
-2.25.1
+ 
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0035-Update-refspecs-for-mbedtls-and-psa-arch-tests-for-v.patch +11 -12
index bf788764..01b99d3e 100644
@@ -1,17 +1,18 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Emekcan Aras <[email protected]>
-
-From ba6af6e6500a2ba25ab6c01d641383c24f9fab07 Mon Sep 17 00:00:00 2001
+From 7aa9796020487ce32746c25934ce20829acc462c Mon Sep 17 00:00:00 2001
 From: Julian Hall <[email protected]>
 Date: Fri, 11 Feb 2022 13:42:59 +0000
-Subject: [PATCH 03/15] Update refspecs for mbedtls and psa-arch-tests for
- v3.1.0
+Subject: [PATCH] Update refspecs for mbedtls and psa-arch-tests for v3.1.0
 
 Updates external component refspecs to use mbedtls 3.1.0 and
 compatible API tests from psa-arch-test.
 
 Signed-off-by: Julian Hall <[email protected]>
 Change-Id: I1b5cebd7de3c1885f5f8a8ea21ba5e4c52aefaf4
+
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Emekcan Aras <[email protected]>
+
+
 ---
  external/MbedTLS/MbedTLS.cmake               |  2 +-
  external/psa_arch_tests/psa_arch_tests.cmake | 17 ++++++-----------
@@ -22,7 +23,7 @@ index 935be765..3350d8a0 100644
 --- a/external/MbedTLS/MbedTLS.cmake
 +++ b/external/MbedTLS/MbedTLS.cmake
 @@ -7,7 +7,7 @@
-
+ 
  set(MBEDTLS_URL "https://github.com/ARMmbed/mbedtls.git"
  		CACHE STRING "Mbed TLS repository URL")
 -set(MBEDTLS_REFSPEC "mbedtls-3.0.0"
@@ -37,7 +38,7 @@ index e6ab73f7..f6d2fb9f 100644
 @@ -5,20 +5,15 @@
  #
  #-------------------------------------------------------------------------------
-
+ 
 -# Determine the number of processes to run while running parallel builds.
 -# Pass -DPROCESSOR_COUNT=<n> to cmake to override.
 -if(NOT DEFINED PROCESSOR_COUNT)
@@ -48,7 +49,7 @@ index e6ab73f7..f6d2fb9f 100644
 +# Temporarily using modified tests used for tf-m verification
 +set(PSA_ARCH_TESTS_URL "https://github.com/bensze01/psa-arch-tests.git" CACHE STRING "psa-arch-tests repository URL")
 +set(PSA_ARCH_TESTS_REFSPEC "fix-multipart-aead" CACHE STRING "psa-arch-tests git refspec")
-
+ 
 -set(PSA_ARCH_TESTS_URL "https://github.com/ARM-software/psa-arch-tests.git" CACHE STRING "psa-arch-tests repository URL")
 -set(PSA_ARCH_TESTS_REFSPEC "master" CACHE STRING "psa-arch-tests git refspec")
 +#set(PSA_ARCH_TESTS_URL "https://github.com/ARM-software/psa-arch-tests.git" CACHE STRING "psa-arch-tests repository URL")
@@ -58,8 +59,6 @@ index e6ab73f7..f6d2fb9f 100644
 -
 -include(FetchContent)
 +set(PSA_ARCH_TESTS_SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_deps/psa_arch_tests-src" CACHE PATH "psa-arch-tests source.")
-
+ 
  # Checking git
  find_program(GIT_COMMAND "git")
---
-2.25.1
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0036-Separate-sign-verify-message-and-hash-operations.patch +72 -72

461 lines not on this page · raw message

meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0037-Add-defence-against-uninitialised-multi-part-transac.patch +10 -11
index af156b0a..a56e0f88 100644
@@ -1,11 +1,7 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Emekcan Aras <[email protected]>
-
-From 68e189877ea1aa893facafb8b336e92112555e07 Mon Sep 17 00:00:00 2001
+From 9a83c32964ee2b1ecb7b36b4c08466202efd3bf2 Mon Sep 17 00:00:00 2001
 From: Julian Hall <[email protected]>
 Date: Fri, 11 Feb 2022 14:19:26 +0000
-Subject: [PATCH 05/15] Add defence against uninitialised multi-part
- transaction
+Subject: [PATCH] Add defence against uninitialised multi-part transaction
 
 Adds checks for the condition where there is an attempt to
 setup a multi-part transaction without first initialising
@@ -13,6 +9,11 @@ transaction state.
 
 Signed-off-by: Julian Hall <[email protected]>
 Change-Id: I754479260fed0490d8f32b41a077d26028dc9903
+
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Emekcan Aras <[email protected]>
+
+
 ---
  components/service/crypto/client/psa/psa_cipher.c | 14 +++++++++++++-
  components/service/crypto/client/psa/psa_hash.c   |  8 +++++++-
@@ -70,7 +71,7 @@ index 7005c390..83278de6 100644
 @@ -14,6 +14,9 @@ psa_status_t psa_hash_setup(psa_hash_operation_t *operation,
  	if (psa_crypto_client_instance.init_status != PSA_SUCCESS)
  		return psa_crypto_client_instance.init_status;
-
+ 
 +	if (operation->handle)
 +		return PSA_ERROR_BAD_STATE;
 +
@@ -101,7 +102,7 @@ index 5efa1c4d..5c5eb32a 100644
 @@ -16,6 +16,9 @@ psa_status_t psa_mac_sign_setup(psa_mac_operation_t *operation,
  	if (psa_crypto_client_instance.init_status != PSA_SUCCESS)
  		return psa_crypto_client_instance.init_status;
-
+ 
 +	if (operation->handle)
 +		return PSA_ERROR_BAD_STATE;
 +
@@ -111,7 +112,7 @@ index 5efa1c4d..5c5eb32a 100644
 @@ -28,7 +31,10 @@ psa_status_t psa_mac_verify_setup(psa_mac_operation_t *operation,
  	if (psa_crypto_client_instance.init_status != PSA_SUCCESS)
  		return psa_crypto_client_instance.init_status;
-
+ 
 -	return crypto_caller_mac_sign_setup(&psa_crypto_client_instance.base,
 +	if (operation->handle)
 +		return PSA_ERROR_BAD_STATE;
@@ -120,5 +121,3 @@ index 5efa1c4d..5c5eb32a 100644
  		&operation->handle,
  		key, alg);
  }
---
-2.25.1
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0038-Integrate-AEAD-operation-support.patch +17 -17
index 9c2ac43a..2ad1efb7 100644
@@ -1,16 +1,18 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Emekcan Aras <[email protected]>
-
-From d800f7eaa25efca41535a223ef5d524651dee103 Mon Sep 17 00:00:00 2001
+From 00b4f777b377c69f948f5a9d68cbfc8fa8c38a86 Mon Sep 17 00:00:00 2001
 From: Julian Hall <[email protected]>
 Date: Fri, 11 Feb 2022 14:24:53 +0000
-Subject: [PATCH 06/15] Integrate AEAD operation support
+Subject: [PATCH] Integrate AEAD operation support
 
 Resolves issues and integrates AEAD support into the crypto service
 provider and clients.
 
 Signed-off-by: Julian Hall <[email protected]>
 Change-Id: I5fbe78a2dd825f592e26fd665f60c18b576f9de9
+
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Emekcan Aras <[email protected]>
+
+
 ---
  .../caller/packed-c/crypto_caller_aead.h      |  70 +++---
  .../client/caller/stub/crypto_caller_aead.h   |  12 +-
@@ -36,7 +38,7 @@ index 3d9947d5..c4ffb20c 100644
 @@ -20,38 +20,6 @@
  extern "C" {
  #endif
-
+ 
 -static inline psa_status_t crypto_caller_aead_encrypt(struct service_client *context,
 -	psa_key_id_t key,
 -	psa_algorithm_t alg,
@@ -79,12 +81,12 @@ index 3d9947d5..c4ffb20c 100644
 -	size_t req_fixed_len = sizeof(struct ts_crypto_aead_abort_in);
 +	size_t req_fixed_len = sizeof(struct ts_crypto_aead_set_lengths_in);
  	size_t req_len = req_fixed_len;
-
+ 
  	req_msg.op_handle = op_handle;
 @@ -611,6 +579,40 @@ static inline psa_status_t crypto_caller_aead_abort(struct service_client *conte
  	return psa_status;
  }
-
+ 
 +/**
 + * The maximum data length that may be carried in an update operation will be
 + * constrained by the maximum call payload capacity imposed by the end-to-end
@@ -136,7 +138,7 @@ index 18aa8cec..455e7ac1 100644
 @@ -135,6 +135,16 @@ static inline psa_status_t crypto_caller_aead_abort(struct service_client *conte
  	return PSA_ERROR_NOT_SUPPORTED;
  }
-
+ 
 +static inline size_t crypto_caller_aead_max_update_ad_size(const struct service_client *context)
 +{
 +	return 0;
@@ -164,7 +166,7 @@ index 22fd3da1..e4579e63 100644
 @@ -8,37 +8,6 @@
  #include "psa_crypto_client.h"
  #include "crypto_caller_selector.h"
-
+ 
 -
 -psa_status_t psa_aead_encrypt(psa_key_id_t key,
 -	psa_algorithm_t alg,
@@ -410,19 +412,19 @@ index 2d926eb6..ee2b4473 100644
 +#include <service/crypto/provider/extension/aead/serializer/packed-c/packedc_aead_provider_serializer.h>
  #include <service/discovery/provider/discovery_provider.h>
  #include <service/discovery/provider/serializer/packed-c/packedc_discovery_provider_serializer.h>
-
+ 
 @@ -34,6 +36,7 @@ static struct full_crypto_provider
  	struct cipher_provider cipher_provider;
  	struct key_derivation_provider key_derivation_provider;
  	struct mac_provider mac_provider;
 +	struct aead_provider aead_provider;
-
+ 
  } instance;
-
+ 
 @@ -98,6 +101,17 @@ struct crypto_provider *crypto_provider_factory_create(void)
  	crypto_provider_extend(&instance.crypto_provider,
  		&instance.mac_provider.base_provider);
-
+ 
 +	/**
 +	 * Extend with aead operations
 +	 */
@@ -436,7 +438,7 @@ index 2d926eb6..ee2b4473 100644
 +
  	return &instance.crypto_provider;
  }
-
+ 
 diff --git a/deployments/component-test/component-test.cmake b/deployments/component-test/component-test.cmake
 index a0233c34..c3b015ab 100644
 --- a/deployments/component-test/component-test.cmake
@@ -517,5 +519,3 @@ index 953bb716..24a8ca65 100644
  		"components/service/crypto/factory/full"
  		"components/service/secure_storage/include"
  		"components/service/secure_storage/frontend/secure_storage_provider"
---
-2.25.1
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0039-Add-IV-generation-to-one-shot-cipher-operation.patch +14 -14
index c4c83c91..0c93a26c 100644
@@ -1,10 +1,7 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Emekcan Aras <[email protected]>
-
-From 0e743c9e00249b0fe50b1b2d28d06a8568569736 Mon Sep 17 00:00:00 2001
+From 43388a8e071980d9146f935f486a859d0a04322b Mon Sep 17 00:00:00 2001
 From: Julian Hall <[email protected]>
 Date: Tue, 15 Feb 2022 15:46:58 +0000
-Subject: [PATCH 07/15] Add IV generation to one-shot cipher operation
+Subject: [PATCH] Add IV generation to one-shot cipher operation
 
 The functions psa_cipher_encrypt and psa_cipher_decrypt are
 one-shot operations that can take an arbitrary sized input.
@@ -18,6 +15,11 @@ failures.
 
 Signed-off-by: Julian Hall <[email protected]>
 Change-Id: I4afb555ee7062ebb387e5bb27fb1e082288ad8c7
+
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Emekcan Aras <[email protected]>
+
+
 ---
  .../service/crypto/client/psa/psa_cipher.c    | 40 +++++++++++++++----
  1 file changed, 33 insertions(+), 7 deletions(-)
@@ -29,15 +31,15 @@ index 3ab8ea21..111af829 100644
 @@ -8,7 +8,6 @@
  #include "psa_crypto_client.h"
  #include "crypto_caller_selector.h"
-
+ 
 -
  psa_status_t psa_cipher_encrypt_setup(psa_cipher_operation_t *operation,
  	psa_key_id_t key,
  	psa_algorithm_t alg)
 @@ -171,9 +170,16 @@ psa_status_t psa_cipher_encrypt(psa_key_id_t key,
-
+ 
  	if (psa_status == PSA_SUCCESS) {
-
+ 
 +		size_t ciphertext_len = 0;
 +		size_t iv_len = 0;
 +
@@ -50,7 +52,7 @@ index 3ab8ea21..111af829 100644
 +
 +		*output_length = iv_len + ciphertext_len;
  	}
-
+ 
  	return psa_status;
 @@ -187,14 +193,34 @@ psa_status_t psa_cipher_decrypt(psa_key_id_t key,
  	size_t output_size,
@@ -60,9 +62,9 @@ index 3ab8ea21..111af829 100644
 -	psa_status_t psa_status = psa_cipher_decrypt_setup(&operation, key, alg);
 +	psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
 +	psa_status_t psa_status = psa_get_key_attributes(key, &attributes);
-
+ 
  	if (psa_status == PSA_SUCCESS) {
-
+ 
 -		psa_status = multi_cipher_update(&operation,
 -			input, input_length,
 -			output, output_size, output_length);
@@ -90,7 +92,5 @@ index 3ab8ea21..111af829 100644
 +
 +		psa_reset_key_attributes(&attributes);
  	}
-
+ 
  	return psa_status;
---
-2.25.1
meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0040-Fix-multi-part-termination-on-error.patch +37 -37

35 lines not on this page · raw message

meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0041-Abort-AEAD-operation-if-client-provided-buffer-is-to.patch +8 -9
index 84f71e51..6a11552d 100644

Lines of this file are not shown. View the raw message.

meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0042-Peg-to-updated-t_cose-version-fc3a4b2c.patch +7 -8
index 8ba59e0a..fedb79ce 100644

Lines of this file are not shown. View the raw message.

meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0043-pass-sysroot_yocto.patch +11 -12
index 5b2b7ce7..64ac0940 100644

Lines of this file are not shown. View the raw message.

meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0044-Fix-Crypto-interface-structure-aligned-with-tf-m-cha.patch +7 -8
index 94a184e2..68d0a978 100644

Lines of this file are not shown. View the raw message.

meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0045-Integrate-remaining-psa-ipc-client-APIs.patch +21 -21

42 lines not on this page · raw message

meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0046-Fix-update-psa_set_key_usage_flags-definition-to-the.patch +10 -10
index 96965fef..4bd846d2 100644

Lines of this file are not shown. View the raw message.

meta-arm-bsp/recipes-security/trusted-services/secure-partitions/corstone1000/0047-Fixes-in-AEAD-for-psa-arch-test-54-and-58.patch +20 -20
index 6e309bfb..4ad4be00 100644

Lines of this file are not shown. View the raw message.

meta-arm-bsp/recipes-security/trusted-services/ts-corstone1000.inc +2 -2
index fe5de58a..88c46a74 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.17.1

Part of the diff is not shown here. View the raw message.

Applied
#1 lore raw
Quoted 3 lines · Jon Mason

Current secure-partitions patches do not apply cleanly with devtool. Update them with the necessary changes to address this issue, and regenerate them via devtool.

Applied, thanks!

[1/1] arm-bsp/corestone1000: update trusted-service patches for devtool

      commit: 10034c0b88754f0d5a2919225fe9f970318f74d6

Best regards,

Signature · 1 line
Jon Mason <[email protected]>