[openwrt/openwrt] curl: fix interface with mbedtls_sha256

LEDE Commits lede-commits at lists.infradead.org
Sat Feb 17 06:02:22 PST 2018


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/e05a6018fc8c9f9413bf88f2471d91a67b1d64d0

commit e05a6018fc8c9f9413bf88f2471d91a67b1d64d0
Author: Russell Senior <russell at personaltelco.net>
AuthorDate: Fri Feb 16 04:15:21 2018 -0800

    curl: fix interface with mbedtls_sha256
    
    Between mbedtls 2.6.0 and 2.7.0, the void returning mbedtls_MODULE* functions
    were deprecated in favor of functions returning an int error code.  Use
    the new function mbedtls_sha256_ret().
    
    Signed-off-by: Russell Senior <russell at personaltelco.net>
    Tested-by: Koen Vandeputte <koen.vandeputte at ncentric.com>
---
 .../320-mbedtls_dont_use_deprecated_sha256_function.patch     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/package/network/utils/curl/patches/320-mbedtls_dont_use_deprecated_sha256_function.patch b/package/network/utils/curl/patches/320-mbedtls_dont_use_deprecated_sha256_function.patch
new file mode 100644
index 0000000..5c4c18c
--- /dev/null
+++ b/package/network/utils/curl/patches/320-mbedtls_dont_use_deprecated_sha256_function.patch
@@ -0,0 +1,11 @@
+--- a/lib/vtls/mbedtls.c
++++ b/lib/vtls/mbedtls.c
+@@ -1029,7 +1029,7 @@ static void Curl_mbedtls_sha256sum(const
+                                     size_t sha256len UNUSED_PARAM)
+ {
+   (void)sha256len;
+-  mbedtls_sha256(input, inputlen, sha256sum, 0);
++  mbedtls_sha256_ret(input, inputlen, sha256sum, 0);
+ }
+ 
+ static void *Curl_mbedtls_get_internals(struct ssl_connect_data *connssl,



More information about the lede-commits mailing list