diff mbox series

[LEDE-DEV] curl: fix interface with mbedtls_sha256

Message ID 87h8qhnnae.fsf@husum.klickitat.com
State Accepted
Delegated to: Hauke Mehrtens
Headers show
Series [LEDE-DEV] curl: fix interface with mbedtls_sha256 | expand

Commit Message

Russell Senior Feb. 16, 2018, 12:15 p.m. UTC 
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>
---
 .../320-mbedtls_dont_use_deprecated_sha256_function.patch     | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 package/network/utils/curl/patches/320-mbedtls_dont_use_deprecated_sha256_function.patch

Comments

Koen Vandeputte Feb. 16, 2018, 1:31 p.m. UTC | #1 
Fixes the build issue

Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
diff mbox series

Patch

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,