From 336b6a32c0c9bec6bf6ccfc5942a3ce62ff34281 Mon Sep 17 00:00:00 2001 From: Wyatt O'Day Date: Mon, 2 Apr 2018 13:33:00 -0400 Subject: tls: fix mbedTLS 2.7.0 build + handle sha256 failures (mbedtls 2.70 compiled with MBEDTLS_DEPRECATED_REMOVED) Closes #2453 --- lib/vtls/vtls.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib/vtls/vtls.c') diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c index def1d30cb..7ad18a3df 100644 --- a/lib/vtls/vtls.c +++ b/lib/vtls/vtls.c @@ -831,8 +831,12 @@ CURLcode Curl_pin_peer_pubkey(struct Curl_easy *data, sha256sumdigest = malloc(CURL_SHA256_DIGEST_LENGTH); if(!sha256sumdigest) return CURLE_OUT_OF_MEMORY; - Curl_ssl->sha256sum(pubkey, pubkeylen, + encode = Curl_ssl->sha256sum(pubkey, pubkeylen, sha256sumdigest, CURL_SHA256_DIGEST_LENGTH); + + if(encode != CURLE_OK) + return encode; + encode = Curl_base64_encode(data, (char *)sha256sumdigest, CURL_SHA256_DIGEST_LENGTH, &encoded, &encodedlen); -- cgit v1.2.3