libcurl: update to 8.9.1

6 files changed, 111 insertions, 71 deletions

diff --git a/libs/libcurl/src/vtls/mbedtls.c b/libs/libcurl/src/vtls/mbedtls.c
index a6286f82d6..9500baff40 100644
--- a/libs/libcurl/src/vtls/mbedtls.c
+++ b/libs/libcurl/src/vtls/mbedtls.c
@@ -249,8 +249,8 @@ static const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_fr =
   1024,      /* RSA min key len */

 };

 

-/* See https://tls.mbed.org/discussions/generic/

-   howto-determine-exact-buffer-len-for-mbedtls_pk_write_pubkey_der

+/* See https://web.archive.org/web/20200921194007/tls.mbed.org/discussions/

+   generic/howto-determine-exact-buffer-len-for-mbedtls_pk_write_pubkey_der

 */

 #define RSA_PUB_DER_MAX_BYTES   (38 + 2 * MBEDTLS_MPI_MAX_SIZE)

 #define ECP_PUB_DER_MAX_BYTES   (30 + 2 * MBEDTLS_ECP_MAX_BYTES)

diff --git a/libs/libcurl/src/vtls/openssl.c b/libs/libcurl/src/vtls/openssl.c
index 7cc15350a4..69329a7e4b 100644
--- a/libs/libcurl/src/vtls/openssl.c
+++ b/libs/libcurl/src/vtls/openssl.c
@@ -231,7 +231,7 @@
 /*

  * Whether SSL_CTX_set1_curves_list is available.

  * OpenSSL: supported since 1.0.2, see

- *   https://www.openssl.org/docs/manmaster/man3/SSL_CTX_set1_groups.html

+ *   https://docs.openssl.org/master/man3/SSL_CTX_set1_curves/

  * BoringSSL: supported since 5fd1807d95f7 (committed 2016-09-30)

  * LibreSSL: since 2.5.3 (April 12, 2017)

  */

@@ -3244,7 +3244,8 @@ static CURLcode populate_x509_store(struct Curl_cfilter *cf,
        problems with server-sent legacy intermediates. Newer versions of

        OpenSSL do alternate chain checking by default but we do not know how to

        determine that in a reliable manner.

-       https://rt.openssl.org/Ticket/Display.html?id=3621&user=guest&pass=guest

+       https://web.archive.org/web/20190422050538/

+       rt.openssl.org/Ticket/Display.html?id=3621

     */

 #if defined(X509_V_FLAG_TRUSTED_FIRST)

     X509_STORE_set_flags(store, X509_V_FLAG_TRUSTED_FIRST);

@@ -3567,12 +3568,12 @@ CURLcode Curl_ossl_ctx_init(struct ossl_ctx *octx,
      CVE-2010-4180 when using previous OpenSSL versions we no longer enable

      this option regardless of OpenSSL version and SSL_OP_ALL definition.

 

-     OpenSSL added a work-around for a SSL 3.0/TLS 1.0 CBC vulnerability

-     (https://www.openssl.org/~bodo/tls-cbc.txt). In 0.9.6e they added a bit to

-     SSL_OP_ALL that _disables_ that work-around despite the fact that

-     SSL_OP_ALL is documented to do "rather harmless" workarounds. In order to

-     keep the secure work-around, the SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS bit

-     must not be set.

+     OpenSSL added a work-around for a SSL 3.0/TLS 1.0 CBC vulnerability:

+     https://web.archive.org/web/20240114184648/openssl.org/~bodo/tls-cbc.txt.

+     In 0.9.6e they added a bit to SSL_OP_ALL that _disables_ that work-around

+     despite the fact that SSL_OP_ALL is documented to do "rather harmless"

+     workarounds. In order to keep the secure work-around, the

+     SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS bit must not be set.

   */

 

   ctx_options = SSL_OP_ALL;

@@ -4363,7 +4364,7 @@ static CURLcode ossl_pkp_pin_peer_pubkey(struct Curl_easy *data, X509* cert,
     if(!buff1)

       break; /* failed */

 

-    /* https://www.openssl.org/docs/crypto/d2i_X509.html */

+    /* https://docs.openssl.org/master/man3/d2i_X509/ */

     len2 = i2d_X509_PUBKEY(X509_get_X509_PUBKEY(cert), &temp);

 

     /*

@@ -4975,7 +4976,7 @@ static ssize_t ossl_recv(struct Curl_cfilter *cf,
     default:

       /* openssl/ssl.h for SSL_ERROR_SYSCALL says "look at error stack/return

          value/errno" */

-      /* https://www.openssl.org/docs/crypto/ERR_get_error.html */

+      /* https://docs.openssl.org/master/man3/ERR_get_error/ */

       if(octx->io_result == CURLE_AGAIN) {

         *curlcode = CURLE_AGAIN;

         nread = -1;

diff --git a/libs/libcurl/src/vtls/vtls.c b/libs/libcurl/src/vtls/vtls.c
index 8e5f8a5491..72fe052c56 100644
--- a/libs/libcurl/src/vtls/vtls.c
+++ b/libs/libcurl/src/vtls/vtls.c
@@ -413,23 +413,6 @@ int Curl_ssl_init(void)
   return Curl_ssl->init();

 }

 

-#if defined(CURL_WITH_MULTI_SSL)

-static const struct Curl_ssl Curl_ssl_multi;

-#endif

-

-/* Global cleanup */

-void Curl_ssl_cleanup(void)

-{

-  if(init_ssl) {

-    /* only cleanup if we did a previous init */

-    Curl_ssl->cleanup();

-#if defined(CURL_WITH_MULTI_SSL)

-    Curl_ssl = &Curl_ssl_multi;

-#endif

-    init_ssl = FALSE;

-  }

-}

-

 static bool ssl_prefs_check(struct Curl_easy *data)

 {

   /* check for CURLOPT_SSLVERSION invalid parameter value */

@@ -1404,6 +1387,19 @@ static const struct Curl_ssl *available_backends[] = {
   NULL

 };

 

+/* Global cleanup */

+void Curl_ssl_cleanup(void)

+{

+  if(init_ssl) {

+    /* only cleanup if we did a previous init */

+    Curl_ssl->cleanup();

+#if defined(CURL_WITH_MULTI_SSL)

+    Curl_ssl = &Curl_ssl_multi;

+#endif

+    init_ssl = FALSE;

+  }

+}

+

 static size_t multissl_version(char *buffer, size_t size)

 {

   static const struct Curl_ssl *selected;

diff --git a/libs/libcurl/src/vtls/wolfssl.c b/libs/libcurl/src/vtls/wolfssl.c
index a305b5f080..d9a8e84325 100644
--- a/libs/libcurl/src/vtls/wolfssl.c
+++ b/libs/libcurl/src/vtls/wolfssl.c
@@ -212,7 +212,7 @@ static int do_file_type(const char *type)
   return -1;

 }

 

-#ifdef HAVE_LIBOQS

+#ifdef WOLFSSL_HAVE_KYBER

 struct group_name_map {

   const word16 group;

   const char   *name;

@@ -434,10 +434,10 @@ static CURLcode populate_x509_store(struct Curl_cfilter *cf,
     }

     infof(data, " CAfile: %s", ssl_cafile ? ssl_cafile : "none");

     infof(data, " CApath: %s", ssl_capath ? ssl_capath : "none");

-    wssl->x509_store_setup = TRUE;

   }

 #endif

   (void)store;

+  wssl->x509_store_setup = TRUE;

   return CURLE_OK;

 }

 

@@ -571,7 +571,7 @@ CURLcode Curl_wssl_setup_x509_store(struct Curl_cfilter *cf,
   bool cache_criteria_met;

 

   /* Consider the X509 store cacheable if it comes exclusively from a CAfile,

-     or no source is provided and we are falling back to OpenSSL's built-in

+     or no source is provided and we are falling back to wolfSSL's built-in

      default. */

   cache_criteria_met = (data->set.general_ssl.ca_cache_timeout != 0) &&

     conn_config->verifypeer &&

@@ -580,19 +580,30 @@ CURLcode Curl_wssl_setup_x509_store(struct Curl_cfilter *cf,
     !ssl_config->primary.CRLfile &&

     !ssl_config->native_ca_store;

 

-  cached_store = get_cached_x509_store(cf, data);

-  if(cached_store && cache_criteria_met

-     && wolfSSL_X509_STORE_up_ref(cached_store)) {

+  cached_store = cache_criteria_met ? get_cached_x509_store(cf, data) : NULL;

+  if(cached_store && wolfSSL_X509_STORE_up_ref(cached_store)) {

     wolfSSL_CTX_set_cert_store(wssl->ctx, cached_store);

   }

-  else {

-    X509_STORE *store = wolfSSL_CTX_get_cert_store(wssl->ctx);

+  else if(cache_criteria_met) {

+    /* wolfSSL's initial store in CTX is not shareable by default.

+     * Make a new one, suitable for adding to the cache. See #14278 */

+    X509_STORE *store = wolfSSL_X509_STORE_new();

+    if(!store) {

+      failf(data, "SSL: could not create a X509 store");

+      return CURLE_OUT_OF_MEMORY;

+    }

+    wolfSSL_CTX_set_cert_store(wssl->ctx, store);

 

     result = populate_x509_store(cf, data, store, wssl);

-    if(result == CURLE_OK && cache_criteria_met) {

+    if(!result) {

       set_cached_x509_store(cf, data, store);

     }

   }

+  else {

+   /* We never share the CTX's store, use it. */

+   X509_STORE *store = wolfSSL_CTX_get_cert_store(wssl->ctx);

+   result = populate_x509_store(cf, data, store, wssl);

+  }

 

   return result;

 }

@@ -611,8 +622,8 @@ wolfssl_connect_step1(struct Curl_cfilter *cf, struct Curl_easy *data)
   struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf);

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

   WOLFSSL_METHOD* req_method = NULL;

-#ifdef HAVE_LIBOQS

-  word16 oqsAlg = 0;

+#ifdef WOLFSSL_HAVE_KYBER

+  word16 pqkem = 0;

   size_t idx = 0;

 #endif

 #ifdef HAVE_SNI

@@ -739,15 +750,15 @@ wolfssl_connect_step1(struct Curl_cfilter *cf, struct Curl_easy *data)
   curves = conn_config->curves;

   if(curves) {

 

-#ifdef HAVE_LIBOQS

+#ifdef WOLFSSL_HAVE_KYBER

     for(idx = 0; gnm[idx].name != NULL; idx++) {

       if(strncmp(curves, gnm[idx].name, strlen(gnm[idx].name)) == 0) {

-        oqsAlg = gnm[idx].group;

+        pqkem = gnm[idx].group;

         break;

       }

     }

 

-    if(oqsAlg == 0)

+    if(pqkem == 0)

 #endif

     {

       if(!SSL_CTX_set1_curves_list(backend->ctx, curves)) {

@@ -821,8 +832,14 @@ wolfssl_connect_step1(struct Curl_cfilter *cf, struct Curl_easy *data)
 

   /* give application a chance to interfere with SSL set up. */

   if(data->set.ssl.fsslctx) {

-    CURLcode result = (*data->set.ssl.fsslctx)(data, backend->ctx,

-                                               data->set.ssl.fsslctxp);

+    CURLcode result;

+    if(!backend->x509_store_setup) {

+      result = Curl_wssl_setup_x509_store(cf, data, backend);

+      if(result)

+        return result;

+    }

+    result = (*data->set.ssl.fsslctx)(data, backend->ctx,

+                                      data->set.ssl.fsslctxp);

     if(result) {

       failf(data, "error signaled by ssl ctx callback");

       return result;

@@ -847,10 +864,10 @@ wolfssl_connect_step1(struct Curl_cfilter *cf, struct Curl_easy *data)
     return CURLE_OUT_OF_MEMORY;

   }

 

-#ifdef HAVE_LIBOQS

-  if(oqsAlg) {

-    if(wolfSSL_UseKeyShare(backend->handle, oqsAlg) != WOLFSSL_SUCCESS) {

-      failf(data, "unable to use oqs KEM");

+#ifdef WOLFSSL_HAVE_KYBER

+  if(pqkem) {

+    if(wolfSSL_UseKeyShare(backend->handle, pqkem) != WOLFSSL_SUCCESS) {

+      failf(data, "unable to use PQ KEM");

     }

   }

 #endif

@@ -1059,15 +1076,9 @@ wolfssl_connect_step2(struct Curl_cfilter *cf, struct Curl_easy *data)
     /* After having send off the ClientHello, we prepare the x509

      * store to verify the coming certificate from the server */

     CURLcode result;

-    struct wolfssl_ctx wssl;

-    wssl.ctx = backend->ctx;

-    wssl.handle = backend->handle;

-    wssl.io_result = CURLE_OK;

-    wssl.x509_store_setup = FALSE;

-    result = Curl_wssl_setup_x509_store(cf, data, &wssl);

+    result = Curl_wssl_setup_x509_store(cf, data, backend);

     if(result)

       return result;

-    backend->x509_store_setup = wssl.x509_store_setup;

   }

 

   connssl->io_need = CURL_SSL_IO_NEED_NONE;

diff --git a/libs/libcurl/src/vtls/x509asn1.c b/libs/libcurl/src/vtls/x509asn1.c
index f8b0dd38e5..5d90c45067 100644
--- a/libs/libcurl/src/vtls/x509asn1.c
+++ b/libs/libcurl/src/vtls/x509asn1.c
@@ -494,7 +494,7 @@ static CURLcode GTime2str(struct dynbuf *store,
   /* Convert an ASN.1 Generalized time to a printable string.

      Return the dynamically allocated string, or NULL if an error occurs. */

 

-  for(fracp = beg; fracp < end && *fracp >= '0' && *fracp <= '9'; fracp++)

+  for(fracp = beg; fracp < end && ISDIGIT(*fracp); fracp++)

     ;

 

   /* Get seconds digits. */

@@ -513,32 +513,44 @@ static CURLcode GTime2str(struct dynbuf *store,
     return CURLE_BAD_FUNCTION_ARGUMENT;

   }

 

-  /* Scan for timezone, measure fractional seconds. */

+  /* timezone follows optional fractional seconds. */

   tzp = fracp;

-  fracl = 0;

+  fracl = 0; /* no fractional seconds detected so far */

   if(fracp < end && (*fracp == '.' || *fracp == ',')) {

-    fracp++;

-    do

+    /* Have fractional seconds, e.g. "[.,]\d+". How many? */

+    fracp++; /* should be a digit char or BAD ARGUMENT */

+    tzp = fracp;

+    while(tzp < end && ISDIGIT(*tzp))

       tzp++;

-    while(tzp < end && *tzp >= '0' && *tzp <= '9');

-    /* Strip leading zeroes in fractional seconds. */

-    for(fracl = tzp - fracp - 1; fracl && fracp[fracl - 1] == '0'; fracl--)

-      ;

+    if(tzp == fracp) /* never looped, no digit after [.,] */

+      return CURLE_BAD_FUNCTION_ARGUMENT;

+    fracl = tzp - fracp; /* number of fractional sec digits */

+    DEBUGASSERT(fracl > 0);

+    /* Strip trailing zeroes in fractional seconds.

+     * May reduce fracl to 0 if only '0's are present. */

+    while(fracl && fracp[fracl - 1] == '0')

+      fracl--;

   }

 

   /* Process timezone. */

-  if(tzp >= end)

-    ;           /* Nothing to do. */

+  if(tzp >= end) {

+    tzp = "";

+    tzl = 0;

+  }

   else if(*tzp == 'Z') {

-    tzp = " GMT";

-    end = tzp + 4;

+    sep = " ";

+    tzp = "GMT";

+    tzl = 3;

+  }

+  else if((*tzp == '+') || (*tzp == '-')) {

+    sep = " UTC";

+    tzl = end - tzp;

   }

   else {

     sep = " ";

-    tzp++;

+    tzl = end - tzp;

   }

 

-  tzl = end - tzp;

   return Curl_dyn_addf(store,

                        "%.4s-%.2s-%.2s %.2s:%.2s:%c%c%s%.*s%s%.*s",

                        beg, beg + 4, beg + 6,

@@ -547,6 +559,15 @@ static CURLcode GTime2str(struct dynbuf *store,
                        sep, (int)tzl, tzp);

 }

 

+#ifdef UNITTESTS

+/* used by unit1656.c */

+CURLcode Curl_x509_GTime2str(struct dynbuf *store,

+                             const char *beg, const char *end)

+{

+  return GTime2str(store, beg, end);

+}

+#endif

+

 /*

  * Convert an ASN.1 UTC time to a printable string.

  *

diff --git a/libs/libcurl/src/vtls/x509asn1.h b/libs/libcurl/src/vtls/x509asn1.h
index 8d245c2d6d..b0155d11a2 100644
--- a/libs/libcurl/src/vtls/x509asn1.h
+++ b/libs/libcurl/src/vtls/x509asn1.h
@@ -77,5 +77,16 @@ CURLcode Curl_extract_certinfo(struct Curl_easy *data, int certnum,
                                const char *beg, const char *end);

 CURLcode Curl_verifyhost(struct Curl_cfilter *cf, struct Curl_easy *data,

                          const char *beg, const char *end);

+

+#ifdef UNITTESTS

+#if defined(USE_GNUTLS) || defined(USE_SCHANNEL) || defined(USE_SECTRANSP) || \

+  defined(USE_MBEDTLS)

+

+/* used by unit1656.c */

+CURLcode Curl_x509_GTime2str(struct dynbuf *store,

+                             const char *beg, const char *end);

+#endif

+#endif

+

 #endif /* USE_GNUTLS or USE_WOLFSSL or USE_SCHANNEL or USE_SECTRANSP */

 #endif /* HEADER_CURL_X509ASN1_H */