Unverified Commit 336b6a32 authored by Wyatt O'Day's avatar Wyatt O'Day Committed by Daniel Stenberg
Browse files

tls: fix mbedTLS 2.7.0 build + handle sha256 failures 

(mbedtls 2.70 compiled with MBEDTLS_DEPRECATED_REMOVED)

Closes #2453
parent 746479ad

lib/vtls/cyassl.c

+2 −1
Original line number Diff line number Diff line
@@ -966,7 +966,7 @@ static CURLcode Curl_cyassl_random(struct Curl_easy *data, 
  return CURLE_OK;

}



static void Curl_cyassl_sha256sum(const unsigned char *tmp, /* input */

static CURLcode Curl_cyassl_sha256sum(const unsigned char *tmp, /* input */

                                  size_t tmplen,

                                  unsigned char *sha256sum /* output */,

                                  size_t unused)
@@ -976,6 +976,7 @@ static void Curl_cyassl_sha256sum(const unsigned char *tmp, /* input */ 
  InitSha256(&SHA256pw);

  Sha256Update(&SHA256pw, tmp, (word32)tmplen);

  Sha256Final(&SHA256pw, sha256sum);

  return CURLE_OK;

}



static void *Curl_cyassl_get_internals(struct ssl_connect_data *connssl,

lib/vtls/darwinssl.c

+2 −1
Original line number Diff line number Diff line
@@ -2894,13 +2894,14 @@ static CURLcode Curl_darwinssl_md5sum(unsigned char *tmp, /* input */ 
  return CURLE_OK;

}



static void Curl_darwinssl_sha256sum(const unsigned char *tmp, /* input */

static CURLcode Curl_darwinssl_sha256sum(const unsigned char *tmp, /* input */

                                     size_t tmplen,

                                     unsigned char *sha256sum, /* output */

                                     size_t sha256len)

{

  assert(sha256len >= CURL_SHA256_DIGEST_LENGTH);

  (void)CC_SHA256(tmp, (CC_LONG)tmplen, sha256sum);

  return CURLE_OK;

}



static bool Curl_darwinssl_false_start(void)

lib/vtls/gtls.c

+2 −1
Original line number Diff line number Diff line
@@ -1761,7 +1761,7 @@ static CURLcode Curl_gtls_md5sum(unsigned char *tmp, /* input */ 
  return CURLE_OK;

}



static void Curl_gtls_sha256sum(const unsigned char *tmp, /* input */

static CURLcode Curl_gtls_sha256sum(const unsigned char *tmp, /* input */

                                size_t tmplen,

                                unsigned char *sha256sum, /* output */

                                size_t sha256len)
@@ -1778,6 +1778,7 @@ static void Curl_gtls_sha256sum(const unsigned char *tmp, /* input */ 
  memcpy(sha256sum, gcry_md_read(SHA256pw, 0), sha256len);

  gcry_md_close(SHA256pw);

#endif

  return CURLE_OK;

}



static bool Curl_gtls_cert_status_request(void)

lib/vtls/mbedtls.c

+8 −1
Original line number Diff line number Diff line
@@ -1023,13 +1023,20 @@ static bool Curl_mbedtls_data_pending(const struct connectdata *conn, 
  return mbedtls_ssl_get_bytes_avail(&BACKEND->ssl) != 0;

}



static void Curl_mbedtls_sha256sum(const unsigned char *input,

static CURLcode Curl_mbedtls_sha256sum(const unsigned char *input,

                                    size_t inputlen,

                                    unsigned char *sha256sum,

                                    size_t sha256len UNUSED_PARAM)

{

  (void)sha256len;

#if MBEDTLS_VERSION_NUMBER < 0x02070000

  mbedtls_sha256(input, inputlen, sha256sum, 0);

#else

  /* returns 0 on success, otherwise failure */

  if(mbedtls_sha256_ret(input, inputlen, sha256sum, 0) != 0)

    return CURLE_BAD_FUNCTION_ARGUMENT;

#endif

  return CURLE_OK;

}



static void *Curl_mbedtls_get_internals(struct ssl_connect_data *connssl,

lib/vtls/nss.c

+3 −1
Original line number Diff line number Diff line
@@ -2314,7 +2314,7 @@ static CURLcode Curl_nss_md5sum(unsigned char *tmp, /* input */ 
  return CURLE_OK;

}



static void Curl_nss_sha256sum(const unsigned char *tmp, /* input */

static CURLcode Curl_nss_sha256sum(const unsigned char *tmp, /* input */

                               size_t tmplen,

                               unsigned char *sha256sum, /* output */

                               size_t sha256len)
@@ -2325,6 +2325,8 @@ static void Curl_nss_sha256sum(const unsigned char *tmp, /* input */ 
  PK11_DigestOp(SHA256pw, tmp, curlx_uztoui(tmplen));

  PK11_DigestFinal(SHA256pw, sha256sum, &SHA256out, curlx_uztoui(sha256len));

  PK11_DestroyContext(SHA256pw, PR_TRUE);



  return CURLE_OK;

}



static bool Curl_nss_cert_status_request(void)