[PATCH honister 0/2] arm-bsp/security: replace mbedcrypto with mbedtls

[PATCH honister 0/2] arm-bsp/security: replace mbedcrypto with mbedtls

[emekcan.aras]

From: Emekcan Aras <Emekcan.Aras@arm.com>

This commit replaces mbedcrpyto with mbedtls on the trusted-service recipe.
 
Signed-off-by: Vishnu Banavath vishnu.banavath@arm.com

Vishnu Banavath (2):
  arm-bsp/security: replace mbedcrypto with mbedtls
  arm-bsp/tf-m: update git SHA

 .../trusted-firmware-m-corstone1000.inc         |  4 +++-
 .../trusted-services/ts-corstone1000.inc        | 17 ++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

-- 
2.25.1

[PATCH honister 1/2] arm-bsp/security: replace mbedcrypto with mbedtls

[emekcan.aras]

From: Vishnu Banavath <vishnu.banavath@arm.com>

This commit replaces mbedcrpyto with mbedtls on the trusted-service
recipe.

Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com>
---
 .../trusted-services/ts-corstone1000.inc        | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/meta-arm-bsp/recipes-security/trusted-services/ts-corstone1000.inc b/meta-arm-bsp/recipes-security/trusted-services/ts-corstone1000.inc
index 499dc31..2731543 100644
--- a/meta-arm-bsp/recipes-security/trusted-services/ts-corstone1000.inc
+++ b/meta-arm-bsp/recipes-security/trusted-services/ts-corstone1000.inc
@@ -2,15 +2,14 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/secure-partitions:"
 
 COMPATIBLE_MACHINE = "corstone1000"
 
-LIC_FILES_CHKSUM += "file://../mbedcrypto/LICENSE;md5=302d50a6369f5f22efdb674db908167a \
-                                             file://../nanopb/LICENSE.txt;md5=9db4b73a55a3994384112efcdb37c01f \
-                                             file://../openamp/LICENSE.md;md5=a8d8cf662ef6bf9936a1e1413585ecbf \
-					     file://../libmetal/LICENSE.md;md5=fe0b8a4beea8f0813b606d15a3df3d3c \
-                                             "
-
+LIC_FILES_CHKSUM += "file://../mbedtls/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+                     file://../nanopb/LICENSE.txt;md5=9db4b73a55a3994384112efcdb37c01f \
+                     file://../openamp/LICENSE.md;md5=a8d8cf662ef6bf9936a1e1413585ecbf \
+		     file://../libmetal/LICENSE.md;md5=fe0b8a4beea8f0813b606d15a3df3d3c \
+		     "
 
 SRC_URI:append = " \
-                 ${SRC_URI_MBED} ${SRC_URI_NANOPB} ${SRC_URI_OPENAMP} ${SRC_URI_LIBMETAL} \
+                 ${SRC_URI_MBEDTLS} ${SRC_URI_NANOPB} ${SRC_URI_OPENAMP} ${SRC_URI_LIBMETAL} \
                   file://0001-tools-cmake-common-applying-lowercase-project-convention.patch \
                   file://0002-fix-EARLY_TA_PATHS-env-variable.patch \
                   file://0003-se-proxy-dts-add-se-proxy-as-child-node.patch \
@@ -45,8 +44,8 @@ SRC_URI:append = " \
                   file://0032-smm_gateway-add-checks-for-null-attributes.patch \
                   "
 
-SRC_URI_MBED = "git://github.com/ARMmbed/mbed-crypto.git;protocol=https;branch=development;name=mbed;destsuffix=git/mbedcrypto"
-SRCREV_mbed = "cf4a40ba0a3086cabb5a8227245191161fd26383"
+SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;protocol=https;branch=development;name=mbedtls;destsuffix=git/mbedtls"
+SRCREV_mbedtls = "d65aeb37349ad1a50e0f6c9b694d4b5290d60e49"
 
 SRC_URI_NANOPB = "git://github.com/nanopb/nanopb.git;name=nanopb;protocol=https;branch=master;destsuffix=git/nanopb"
 SRCREV_nanopb = "df0e92f474f9cca704fe2b31483f0b4d1b1715a4"
-- 
2.25.1

[PATCH honister 2/2] arm-bsp/tf-m: update git SHA

[emekcan.aras]

From: Vishnu Banavath <vishnu.banavath@arm.com>

This change is to update TF-M git SHA to fix
psa-arch-tests test case failures.

Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com>
---
 .../trusted-firmware-m/trusted-firmware-m-corstone1000.inc    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc
index 98641c2..56065a6 100644
--- a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc
+++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc
@@ -7,8 +7,10 @@ TFM_DEBUG = "1"
 ## Default is the MPS3 board
 TFM_PLATFORM_IS_FVP ?= "FALSE"
 EXTRA_OECMAKE += "-DPLATFORM_IS_FVP=${TFM_PLATFORM_IS_FVP}"
+EXTRA_OECMAKE += "-DCC312_LEGACY_DRIVER_API_ENABLED=OFF"
 
-SRCREV_tfm = "49a28600f9dd640638f667273ef15acb6d1a8e1c"
+SRCBRANCH_tfm = "master"
+SRCREV_tfm = "f8c7e5361b92b16108165601ea81c5d01feb3c22"
 SRCREV_mbedtls = "d65aeb37349ad1a50e0f6c9b694d4b5290d60e49"
 SRCREV_mcuboot = "29099e1d17f93ae1d09fe945ad191b703aacd3d8"
 
-- 
2.25.1

Re: [PATCH honister 0/2] arm-bsp/security: replace mbedcrypto with mbedtls

[Jon Mason]

On Thu, 17 Feb 2022 15:45:29 +0000, emekcan.aras@arm.com wrote:
> This commit replaces mbedcrpyto with mbedtls on the trusted-service recipe.
> 
> Signed-off-by: Vishnu Banavath vishnu.banavath@arm.com
> 
> Vishnu Banavath (2):
>   arm-bsp/security: replace mbedcrypto with mbedtls
>   arm-bsp/tf-m: update git SHA
> 
> [...]

Applied, thanks!

[1/2] arm-bsp/security: replace mbedcrypto with mbedtls
      commit: 68db42ec651ff33301a89361c0cc2219d919297a
[2/2] arm-bsp/tf-m: update git SHA
      commit: 8a6b6eb8109ed4567353f2318f172261246718c1

Best regards,
-- 
Jon Mason <jon.mason@arm.com>