diff options
author | Alexander Vickberg <wickbergster@gmail.com> | 2020-12-17 14:02:07 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-12-17 09:12:27 -0800 |
commit | f431022415f3eaeb1f4563f4c7cdb7e33461e805 (patch) | |
tree | 9154bbe6f65e633c0e003981725fa52129eb2c50 | |
parent | 556293d49f973db863c82b211036f22171ffa7e6 (diff) | |
download | meta-openembedded-f431022415f3eaeb1f4563f4c7cdb7e33461e805.tar.gz |
mbedtls: upgrade to 2.25.0
Deleted build fix patch. This is already applied in this release.
Signed-off-by: Alexander Vickberg <wickbergster@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-networking/recipes-connectivity/mbedtls/mbedtls/fix-incorrect-EOF-check-in-ssl_context_info.patch | 57 | ||||
-rw-r--r-- | meta-networking/recipes-connectivity/mbedtls/mbedtls_2.25.0.bb (renamed from meta-networking/recipes-connectivity/mbedtls/mbedtls_2.24.0.bb) | 6 |
2 files changed, 2 insertions, 61 deletions
diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls/fix-incorrect-EOF-check-in-ssl_context_info.patch b/meta-networking/recipes-connectivity/mbedtls/mbedtls/fix-incorrect-EOF-check-in-ssl_context_info.patch deleted file mode 100644 index 836fce91e6..0000000000 --- a/meta-networking/recipes-connectivity/mbedtls/mbedtls/fix-incorrect-EOF-check-in-ssl_context_info.patch +++ /dev/null @@ -1,57 +0,0 @@ -From d696e7d91e42a190d06760279d2e396392143454 Mon Sep 17 00:00:00 2001 -From: Nayna Jain <nayna@linux.ibm.com> -Date: Thu, 13 Aug 2020 19:17:53 +0000 -Subject: [PATCH] programs/ssl: Fix incorrect EOF check in ssl_context_info.c - -In `read_next_b64_code()`, the result of fgetc() is stored into a char, -but later compared against EOF, which is generally -1. On platforms -where char is unsigned, this generates a compiler warning/error that the -comparison will never be true (causing a build failure). The value will -never match, with the function ultimately bailing with a "Too many bad -symbols are detected" error. - -On platforms with signed char, EOF is detected, but a file containing a -0xFF character will causes a premature end of file exit of the loop. - -Fix this by changing the result to an int. - -Fixes #3794. - -Signed-off-by: Nayna Jain <nayna@linux.ibm.com> -Signed-off-by: David Brown <david.brown@linaro.org> ---- - ChangeLog.d/bugfix_3794.txt | 4 ++++ - programs/ssl/ssl_context_info.c | 4 ++-- - 2 files changed, 6 insertions(+), 2 deletions(-) - create mode 100644 ChangeLog.d/bugfix_3794.txt - -diff --git a/ChangeLog.d/bugfix_3794.txt b/ChangeLog.d/bugfix_3794.txt -new file mode 100644 -index 0000000000..a483ea76ae ---- /dev/null -+++ b/ChangeLog.d/bugfix_3794.txt -@@ -0,0 +1,4 @@ -+Bugfix -+ * Fix handling of EOF against 0xff bytes and on platforms with -+ unsigned chars. Fixes a build failure on platforms where char is -+ unsigned. Fixes #3794. -diff --git a/programs/ssl/ssl_context_info.c b/programs/ssl/ssl_context_info.c -index df8819a804..d109c1e6f7 100644 ---- a/programs/ssl/ssl_context_info.c -+++ b/programs/ssl/ssl_context_info.c -@@ -377,13 +377,13 @@ size_t read_next_b64_code( uint8_t **b64, size_t *max_len ) - int valid_balance = 0; /* balance between valid and invalid characters */ - size_t len = 0; - char pad = 0; -- char c = 0; -+ int c = 0; - - while( EOF != c ) - { - char c_valid = 0; - -- c = (char) fgetc( b64_file ); -+ c = fgetc( b64_file ); - - if( pad > 0 ) - { diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.24.0.bb b/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.25.0.bb index e3a0169566..27c1b209dc 100644 --- a/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.24.0.bb +++ b/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.25.0.bb @@ -23,10 +23,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SECTION = "libs" S = "${WORKDIR}/git" -SRCREV = "523f0554b6cdc7ace5d360885c3f5bbcc73ec0e8" -SRC_URI = "git://github.com/ARMmbed/mbedtls.git;protocol=https;branch=development \ - file://fix-incorrect-EOF-check-in-ssl_context_info.patch \ -" +SRCREV = "1c54b5410fd48d6bcada97e30cac417c5c7eea67" +SRC_URI = "git://github.com/ARMmbed/mbedtls.git;protocol=https;branch=development" inherit cmake |