summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-networking/recipes-connectivity/mbedtls/mbedtls/0001-ssl_tls-Increase-size-of-padbuf-to-64.patch34
-rw-r--r--meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.0.bb (renamed from meta-networking/recipes-connectivity/mbedtls/mbedtls_2.26.0.bb)5
2 files changed, 2 insertions, 37 deletions
diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls/0001-ssl_tls-Increase-size-of-padbuf-to-64.patch b/meta-networking/recipes-connectivity/mbedtls/mbedtls/0001-ssl_tls-Increase-size-of-padbuf-to-64.patch
deleted file mode 100644
index f3ba04f51f..0000000000
--- a/meta-networking/recipes-connectivity/mbedtls/mbedtls/0001-ssl_tls-Increase-size-of-padbuf-to-64.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From c3d7321d59e959b357a7d3d69782d9105f3d04aa Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 1 Mar 2021 21:04:57 -0800
4Subject: [PATCH] ssl_tls: Increase size of padbuf to 64
5
6This fixes warnings with gcc11
7
8git/library/ssl_tls.c: In function 'ssl_calc_finished_tls_sha384':
9git/library/ssl_tls.c:3267:5: error: 'mbedtls_sha512_finish_ret' accessing 64 bytes in a region of size 48 [-Werror=stringop-overflow=]
10 3267 | finish( &sha512, padbuf );
11 | ^~~~~~~~~~~~~~~~~~~~~~~~~
12git/library/ssl_tls.c:3267:5: note: referencing argument 2 of type 'unsigned char *'
13
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 library/ssl_tls.c | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/library/ssl_tls.c b/library/ssl_tls.c
20index a1a5859f0..4c98a4104 100644
21--- a/library/ssl_tls.c
22+++ b/library/ssl_tls.c
23@@ -3205,7 +3205,7 @@ static void ssl_calc_finished_tls_sha384(
24 {
25 int len = 12;
26 const char *sender;
27- unsigned char padbuf[48];
28+ unsigned char padbuf[64];
29 #if defined(MBEDTLS_USE_PSA_CRYPTO)
30 size_t hash_size;
31 psa_hash_operation_t sha384_psa = PSA_HASH_OPERATION_INIT;
32--
332.30.1
34
diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.26.0.bb b/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.0.bb
index b62ed04ce6..d4a9c7bf8d 100644
--- a/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.26.0.bb
+++ b/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.0.bb
@@ -23,9 +23,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
23SECTION = "libs" 23SECTION = "libs"
24 24
25S = "${WORKDIR}/git" 25S = "${WORKDIR}/git"
26SRCREV = "e483a77c85e1f9c1dd2eb1c5a8f552d2617fe400" 26SRCREV = "8b3f26a5ac38d4fdccbc5c5366229f3e01dafcc0"
27SRC_URI = "git://github.com/ARMmbed/mbedtls.git;protocol=https;branch=development" 27SRC_URI = "git://github.com/ARMmbed/mbedtls.git;protocol=https;branch=mbedtls-2.28"
28SRC_URI += "file://0001-ssl_tls-Increase-size-of-padbuf-to-64.patch"
29 28
30inherit cmake 29inherit cmake
31 30