From 8340f5f0115ca6347287116b7f5b5e1970137c2d Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Wed, 11 Sep 2024 16:11:17 +0800 Subject: [PATCH] mbedtls: upgrade 3.6.0 -> 3.6.1 ChangeLog: https://github.com/Mbed-TLS/mbedtls/releases/tag/mbedtls-3.6.1 Security fixes: CVE-2024-45157 CVE-2024-45158 CVE-2024-45159 * According to commit[1], install data_files into framework directory for ptest. [1] https://github.com/Mbed-TLS/mbedtls/commit/9c4dd4ee6fe570b6a50a275d78b7d140fec0e02f Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- .../mbedtls/{mbedtls_3.6.0.bb => mbedtls_3.6.1.bb} | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) rename meta-networking/recipes-connectivity/mbedtls/{mbedtls_3.6.0.bb => mbedtls_3.6.1.bb} (93%) diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.0.bb b/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.1.bb similarity index 93% rename from meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.0.bb rename to meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.1.bb index 7011d54f35..62c3add2a5 100644 --- a/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.0.bb +++ b/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.1.bb @@ -23,12 +23,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" SECTION = "libs" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/Mbed-TLS/mbedtls.git;protocol=https;branch=master \ +SRC_URI = "git://github.com/Mbed-TLS/mbedtls.git;protocol=https;branch=mbedtls-3.6 \ git://github.com/Mbed-TLS/mbedtls-framework.git;protocol=https;branch=main;destsuffix=git/framework;name=framework \ file://run-ptest" -SRCREV = "2ca6c285a0dd3f33982dd57299012dacab1ff206" -SRCREV_framework = "750634d3a51eb9d61b59fd5d801546927c946588" +SRCREV = "71c569d44bf3a8bd53d874c81ee8ac644dd6e9e3" +SRCREV_framework = "94599c0e3b5036e086446a51a3f79640f70f22f6" SRCREV_FORMAT .= "_framework" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" @@ -74,7 +74,8 @@ sysroot_stage_all:append() { do_install_ptest () { install -d ${D}${PTEST_PATH}/tests + install -d ${D}${PTEST_PATH}/framework cp -f ${B}/tests/test_suite_* ${D}${PTEST_PATH}/tests/ find ${D}${PTEST_PATH}/tests/ -type f -name "*.c" -delete - cp -fR ${S}/tests/data_files ${D}${PTEST_PATH}/tests/ + cp -fR ${S}/framework/data_files ${D}${PTEST_PATH}/framework/ }