aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell Senior <russell@personaltelco.net>2018-02-16 04:15:21 -0800
committerHauke Mehrtens <hauke@hauke-m.de>2018-02-17 12:29:23 +0100
commite05a6018fc8c9f9413bf88f2471d91a67b1d64d0 (patch)
treea8e13b3ef8dbd40b2bf86f8ade40db101d1f0ddc
parent6be73c07dbd69d49493d69bbd7978ec3d89bef56 (diff)
downloadupstream-e05a6018fc8c9f9413bf88f2471d91a67b1d64d0.tar.gz
upstream-e05a6018fc8c9f9413bf88f2471d91a67b1d64d0.tar.bz2
upstream-e05a6018fc8c9f9413bf88f2471d91a67b1d64d0.zip
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@personaltelco.net> Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
-rw-r--r--package/network/utils/curl/patches/320-mbedtls_dont_use_deprecated_sha256_function.patch11
1 files changed, 11 insertions, 0 deletions
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 0000000000..5c4c18c2a4
--- /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,