libcurl: update to 8.2.0

1 files changed, 21 insertions, 11 deletions

diff --git a/libs/libcurl/src/vtls/mbedtls.c b/libs/libcurl/src/vtls/mbedtls.c
index 7d084af412..4e4fe3f239 100644
--- a/libs/libcurl/src/vtls/mbedtls.c
+++ b/libs/libcurl/src/vtls/mbedtls.c
@@ -81,7 +81,7 @@
 #  endif

 #endif

 

-struct ssl_backend_data {

+struct mbed_ssl_backend_data {

   mbedtls_ctr_drbg_context ctr_drbg;

   mbedtls_entropy_context entropy;

   mbedtls_ssl_context ssl;

@@ -255,7 +255,8 @@ static CURLcode
 set_ssl_version_min_max(struct Curl_cfilter *cf, struct Curl_easy *data)

 {

   struct ssl_connect_data *connssl = cf->ctx;

-  struct ssl_backend_data *backend = connssl->backend;

+  struct mbed_ssl_backend_data *backend =

+    (struct mbed_ssl_backend_data *)connssl->backend;

   struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf);

 #if MBEDTLS_VERSION_NUMBER >= 0x03000000

   int mbedtls_ver_min = MBEDTLS_SSL_MINOR_VERSION_3;

@@ -307,7 +308,8 @@ static CURLcode
 mbed_connect_step1(struct Curl_cfilter *cf, struct Curl_easy *data)

 {

   struct ssl_connect_data *connssl = cf->ctx;

-  struct ssl_backend_data *backend = connssl->backend;

+  struct mbed_ssl_backend_data *backend =

+    (struct mbed_ssl_backend_data *)connssl->backend;

   struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf);

   const struct curl_blob *ca_info_blob = conn_config->ca_info_blob;

   struct ssl_config_data *ssl_config = Curl_ssl_cf_get_config(cf, data);

@@ -697,7 +699,8 @@ mbed_connect_step2(struct Curl_cfilter *cf, struct Curl_easy *data)
 {

   int ret;

   struct ssl_connect_data *connssl = cf->ctx;

-  struct ssl_backend_data *backend = connssl->backend;

+  struct mbed_ssl_backend_data *backend =

+    (struct mbed_ssl_backend_data *)connssl->backend;

   struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf);

   const mbedtls_x509_crt *peercert;

   const char * const pinnedpubkey = Curl_ssl_cf_is_proxy(cf)?

@@ -860,7 +863,8 @@ mbed_connect_step3(struct Curl_cfilter *cf, struct Curl_easy *data)
 {

   CURLcode retcode = CURLE_OK;

   struct ssl_connect_data *connssl = cf->ctx;

-  struct ssl_backend_data *backend = connssl->backend;

+  struct mbed_ssl_backend_data *backend =

+    (struct mbed_ssl_backend_data *)connssl->backend;

   struct ssl_config_data *ssl_config = Curl_ssl_cf_get_config(cf, data);

 

   DEBUGASSERT(ssl_connect_3 == connssl->connecting_state);

@@ -915,7 +919,8 @@ static ssize_t mbed_send(struct Curl_cfilter *cf, struct Curl_easy *data,
                          CURLcode *curlcode)

 {

   struct ssl_connect_data *connssl = cf->ctx;

-  struct ssl_backend_data *backend = connssl->backend;

+  struct mbed_ssl_backend_data *backend =

+    (struct mbed_ssl_backend_data *)connssl->backend;

   int ret = -1;

 

   (void)data;

@@ -939,7 +944,8 @@ static void mbedtls_close_all(struct Curl_easy *data)
 static void mbedtls_close(struct Curl_cfilter *cf, struct Curl_easy *data)

 {

   struct ssl_connect_data *connssl = cf->ctx;

-  struct ssl_backend_data *backend = connssl->backend;

+  struct mbed_ssl_backend_data *backend =

+    (struct mbed_ssl_backend_data *)connssl->backend;

   char buf[32];

 

   (void)data;

@@ -968,7 +974,8 @@ static ssize_t mbed_recv(struct Curl_cfilter *cf, struct Curl_easy *data,
                          CURLcode *curlcode)

 {

   struct ssl_connect_data *connssl = cf->ctx;

-  struct ssl_backend_data *backend = connssl->backend;

+  struct mbed_ssl_backend_data *backend =

+    (struct mbed_ssl_backend_data *)connssl->backend;

   int ret = -1;

   ssize_t len = -1;

 

@@ -1204,10 +1211,12 @@ static bool mbedtls_data_pending(struct Curl_cfilter *cf,
                                  const struct Curl_easy *data)

 {

   struct ssl_connect_data *ctx = cf->ctx;

+  struct mbed_ssl_backend_data *backend;

 

   (void)data;

   DEBUGASSERT(ctx && ctx->backend);

-  return mbedtls_ssl_get_bytes_avail(&ctx->backend->ssl) != 0;

+  backend = (struct mbed_ssl_backend_data *)ctx->backend;

+  return mbedtls_ssl_get_bytes_avail(&backend->ssl) != 0;

 }

 

 static CURLcode mbedtls_sha256sum(const unsigned char *input,

@@ -1234,7 +1243,8 @@ static CURLcode mbedtls_sha256sum(const unsigned char *input,
 static void *mbedtls_get_internals(struct ssl_connect_data *connssl,

                                    CURLINFO info UNUSED_PARAM)

 {

-  struct ssl_backend_data *backend = connssl->backend;

+  struct mbed_ssl_backend_data *backend =

+    (struct mbed_ssl_backend_data *)connssl->backend;

   (void)info;

   DEBUGASSERT(backend);

   return &backend->ssl;

@@ -1249,7 +1259,7 @@ const struct Curl_ssl Curl_ssl_mbedtls = {
   SSLSUPP_SSL_CTX |

   SSLSUPP_HTTPS_PROXY,

 

-  sizeof(struct ssl_backend_data),

+  sizeof(struct mbed_ssl_backend_data),

 

   mbedtls_init,                     /* init */

   mbedtls_cleanup,                  /* cleanup */