From e4a580937379be1ea272f3526c493e36478a3bfc Mon Sep 17 00:00:00 2001 From: Rui Miguel Silva Date: Mon, 24 Oct 2022 14:24:12 +0100 Subject: [PATCH] arm-bsp/corstone1000: apply ts patch to psa crypto api test Apply shared patch to trusted services that is used to compile psa crypto api tests to include change in packed-c request message in the eaed update structure to be in sync with the serialize/deserialize in TS side. As at it, move the other corstone1000 specific patch file to meta-arm-bsp where it should be. Signed-off-by: Rui Miguel Silva Signed-off-by: Jon Mason --- .../0018-Fixes-in-AEAD-for-psa-arch-test-54-and-58.patch | 4 +++- .../0001-corstone1000-port-crypto-config.patch | 0 .../trusted-services/ts-psa-crypto-api-test_git.bbappend | 7 +++++++ .../trusted-services/ts-psa-api-test-common_git.inc | 1 - 4 files changed, 10 insertions(+), 2 deletions(-) rename meta-arm/recipes-security/trusted-services/files/0002-corstone1000-port-crypto-config.patch => meta-arm-bsp/recipes-security/trusted-services/corstone1000/ts-psa-crypto-api-test/0001-corstone1000-port-crypto-config.patch (100%) create mode 100644 meta-arm-bsp/recipes-security/trusted-services/ts-psa-crypto-api-test_git.bbappend diff --git a/meta-arm-bsp/recipes-security/trusted-services/corstone1000/0018-Fixes-in-AEAD-for-psa-arch-test-54-and-58.patch b/meta-arm-bsp/recipes-security/trusted-services/corstone1000/0018-Fixes-in-AEAD-for-psa-arch-test-54-and-58.patch index 0fdb254f..9ab1157e 100644 --- a/meta-arm-bsp/recipes-security/trusted-services/corstone1000/0018-Fixes-in-AEAD-for-psa-arch-test-54-and-58.patch +++ b/meta-arm-bsp/recipes-security/trusted-services/corstone1000/0018-Fixes-in-AEAD-for-psa-arch-test-54-and-58.patch @@ -1,9 +1,11 @@ +Upstream-Status: Pending [Not submitted to upstream yet] +Signed-off-by: Emekcan Aras + From a1da63a8c4d55d52321608a72129af49e0a498b2 Mon Sep 17 00:00:00 2001 From: Satish Kumar Date: Mon, 14 Feb 2022 08:22:25 +0000 Subject: [PATCH 18/19] Fixes in AEAD for psa-arch test 54 and 58. -Upstream-Status: Pending Signed-off-by: Satish Kumar Signed-off-by: Rui Miguel Silva --- diff --git a/meta-arm/recipes-security/trusted-services/files/0002-corstone1000-port-crypto-config.patch b/meta-arm-bsp/recipes-security/trusted-services/corstone1000/ts-psa-crypto-api-test/0001-corstone1000-port-crypto-config.patch similarity index 100% rename from meta-arm/recipes-security/trusted-services/files/0002-corstone1000-port-crypto-config.patch rename to meta-arm-bsp/recipes-security/trusted-services/corstone1000/ts-psa-crypto-api-test/0001-corstone1000-port-crypto-config.patch diff --git a/meta-arm-bsp/recipes-security/trusted-services/ts-psa-crypto-api-test_git.bbappend b/meta-arm-bsp/recipes-security/trusted-services/ts-psa-crypto-api-test_git.bbappend new file mode 100644 index 00000000..6595c92a --- /dev/null +++ b/meta-arm-bsp/recipes-security/trusted-services/ts-psa-crypto-api-test_git.bbappend @@ -0,0 +1,7 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/corstone1000:" +FILESEXTRAPATHS:prepend := "${THISDIR}/corstone1000/${PN}:" + +SRC_URI:append:corstone1000 = " \ + file://0001-corstone1000-port-crypto-config.patch;patchdir=../psatest \ + file://0018-Fixes-in-AEAD-for-psa-arch-test-54-and-58.patch;patchdir=../trusted-services \ + " diff --git a/meta-arm/recipes-security/trusted-services/ts-psa-api-test-common_git.inc b/meta-arm/recipes-security/trusted-services/ts-psa-api-test-common_git.inc index 3bb7bea3..dfd47163 100644 --- a/meta-arm/recipes-security/trusted-services/ts-psa-api-test-common_git.inc +++ b/meta-arm/recipes-security/trusted-services/ts-psa-api-test-common_git.inc @@ -9,7 +9,6 @@ RDEPENDS:${PN} += "libts" SRC_URI += "git://github.com/ARM-software/psa-arch-tests.git;name=psatest;protocol=https;branch=main;destsuffix=git/psatest \ file://0001-Pass-Yocto-build-settings-to-psa-arch-tests-native.patch;patchdir=../psatest \ - file://0002-corstone1000-port-crypto-config.patch;patchdir=../psatest \ " SRCREV_psatest = "451aa087a40d02c7d04778235014c5619d126471"