From b0f7978847f8e62fd84ad2ff648c26c188497a6c Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Wed, 28 Jun 2023 20:58:45 +0800 Subject: [PATCH] mbedtls: upgrade 2.28.2 -> 2.28.3 Mbed TLS 2.28 is a long-time support branch. It will be supported with bug-fixes and security fixes until end of 2024. ChangeLog: https://github.com/Mbed-TLS/mbedtls/releases/tag/v2.28.3 Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- .../mbedtls/{mbedtls_2.28.2.bb => mbedtls_2.28.3.bb} | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) rename meta-networking/recipes-connectivity/mbedtls/{mbedtls_2.28.2.bb => mbedtls_2.28.3.bb} (93%) diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.2.bb b/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.3.bb similarity index 93% rename from meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.2.bb rename to meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.3.bb index 242495e941..ce094d5afb 100644 --- a/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.2.bb +++ b/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.3.bb @@ -23,7 +23,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SECTION = "libs" S = "${WORKDIR}/git" -SRCREV = "89f040a5c938985c5f30728baed21e49d0846a53" +SRCREV = "981743de6fcdbe672e482b6fd724d31d0a0d2476" SRC_URI = "git://github.com/ARMmbed/mbedtls.git;protocol=https;branch=mbedtls-2.28 \ file://run-ptest \ " @@ -62,6 +62,12 @@ CVE_CHECK_IGNORE += "CVE-2021-43666" # Fix merged upstream https://github.com/Mbed-TLS/mbedtls/commit/9a4a9c66a48edfe9ece03c7e4a53310adf73a86c CVE_CHECK_IGNORE += "CVE-2021-45451" +# Strip host paths from autogenerated test files +do_compile:append() { + sed -i 's+${S}/++g' ${B}/tests/*.c 2>/dev/null || : + sed -i 's+${B}/++g' ${B}/tests/*.c 2>/dev/null || : +} + # Export source files/headers needed by Arm Trusted Firmware sysroot_stage_all:append() { sysroot_stage_dir "${S}/library" "${SYSROOT_DESTDIR}/usr/share/mbedtls-source/library"