diff --git a/meta-oniro-staging/recipes-connectivity/mbedtls/mbedtls/0001-ssl_tls-Increase-size-of-padbuf-to-64.patch b/meta-oniro-staging/recipes-connectivity/mbedtls/mbedtls/0001-ssl_tls-Increase-size-of-padbuf-to-64.patch deleted file mode 100644 index f3ba04f51f5970ae68ee23572dbf11e07b0a6ae0..0000000000000000000000000000000000000000 --- a/meta-oniro-staging/recipes-connectivity/mbedtls/mbedtls/0001-ssl_tls-Increase-size-of-padbuf-to-64.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c3d7321d59e959b357a7d3d69782d9105f3d04aa Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 1 Mar 2021 21:04:57 -0800 -Subject: [PATCH] ssl_tls: Increase size of padbuf to 64 - -This fixes warnings with gcc11 - -git/library/ssl_tls.c: In function 'ssl_calc_finished_tls_sha384': -git/library/ssl_tls.c:3267:5: error: 'mbedtls_sha512_finish_ret' accessing 64 bytes in a region of size 48 [-Werror=stringop-overflow=] - 3267 | finish( &sha512, padbuf ); - | ^~~~~~~~~~~~~~~~~~~~~~~~~ -git/library/ssl_tls.c:3267:5: note: referencing argument 2 of type 'unsigned char *' - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - library/ssl_tls.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/library/ssl_tls.c b/library/ssl_tls.c -index a1a5859f0..4c98a4104 100644 ---- a/library/ssl_tls.c -+++ b/library/ssl_tls.c -@@ -3205,7 +3205,7 @@ static void ssl_calc_finished_tls_sha384( - { - int len = 12; - const char *sender; -- unsigned char padbuf[48]; -+ unsigned char padbuf[64]; - #if defined(MBEDTLS_USE_PSA_CRYPTO) - size_t hash_size; - psa_hash_operation_t sha384_psa = PSA_HASH_OPERATION_INIT; --- -2.30.1 - diff --git a/meta-oniro-staging/recipes-connectivity/mbedtls/mbedtls_2.26.0.bb b/meta-oniro-staging/recipes-connectivity/mbedtls/mbedtls_2.26.0.bb deleted file mode 100644 index 3d03050c8f13fbbf05f9b99f9b507e67dc6d0cfb..0000000000000000000000000000000000000000 --- a/meta-oniro-staging/recipes-connectivity/mbedtls/mbedtls_2.26.0.bb +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -SUMMARY = "Lightweight crypto and SSL/TLS library" -DESCRIPTION = "mbedtls is a lean open source crypto library \ -for providing SSL and TLS support in your programs. It offers \ -an intuitive API and documented header files, so you can actually \ -understand what the code does." - -HOMEPAGE = "https://tls.mbed.org/" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SECTION = "libs" - -S = "${WORKDIR}/git" -SRCREV = "e483a77c85e1f9c1dd2eb1c5a8f552d2617fe400" -SRC_URI = "git://github.com/ARMmbed/mbedtls.git;protocol=https \ -file://0001-ssl_tls-Increase-size-of-padbuf-to-64.patch \ -file://0002-workaround-gcc9-Wformat-truncation-false-positives.patch" - -inherit cmake - -PACKAGECONFIG ??= "shared-libs programs" -PACKAGECONFIG[shared-libs] = "-DUSE_SHARED_MBEDTLS_LIBRARY=ON,-DUSE_SHARED_MBEDTLS_LIBRARY=OFF" -PACKAGECONFIG[programs] = "-DENABLE_PROGRAMS=ON,-DENABLE_PROGRAMS=OFF" - -EXTRA_OECMAKE = "-DENABLE_ZLIB_SUPPORT:BOOL=ON -DLINK_WITH_PTHREAD:BOOL=ON -DENABLE_TESTING:BOOL=OFF -DLIB_INSTALL_DIR:STRING=${libdir}" - -PROVIDES += "polarssl" -RPROVIDES_${PN} = "polarssl" - -PACKAGES =+ "${PN}-programs" -FILES_${PN}-programs = "${bindir}/" - -DEPENDS = "zlib" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oniro-staging/recipes-connectivity/mbedtls/mbedtls_2.26.0.bbappend b/meta-oniro-staging/recipes-connectivity/mbedtls/mbedtls_2.26.0.bbappend new file mode 100644 index 0000000000000000000000000000000000000000..4cdf01b39dbb4dbd33a0e26c54bba066395d9f5d --- /dev/null +++ b/meta-oniro-staging/recipes-connectivity/mbedtls/mbedtls_2.26.0.bbappend @@ -0,0 +1,6 @@ +# SPDX-FileCopyrightText: Huawei Inc. +# +# SPDX-License-Identifier: Apache-2.0 + +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +SRC_URI += "file://0002-workaround-gcc9-Wformat-truncation-false-positives.patch"