From 50a3213e7701820fff65b38535e51105ea3d90ec Mon Sep 17 00:00:00 2001 From: Sergey Markelov Date: Sun, 21 Apr 2024 14:12:15 -0700 Subject: [PATCH] temp --- .github/workflows/linux.yml | 8 ++++---- lib/vtls/mbedtls.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 3d447a871bc19e..d14a963849e24b 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -418,10 +418,10 @@ jobs: - run: make V=1 -C tests name: 'make tests' - - run: make V=1 test-ci - name: 'run tests' - env: - TFLAGS: "${{ matrix.build.tflags }}" + #- run: make V=1 test-ci + # name: 'run tests' + # env: + # TFLAGS: "${{ matrix.build.tflags }}" - if: contains(matrix.build.install_steps, 'pytest') # run for `tests` directory, so pytest does not pick up any other diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c index 8f61e6b25ead92..7eb116b69b1402 100644 --- a/lib/vtls/mbedtls.c +++ b/lib/vtls/mbedtls.c @@ -783,10 +783,14 @@ static CURLcode collect_server_cert(struct Curl_cfilter *cf, const bool show_verbose_server_cert = false; #endif struct ssl_config_data *ssl_config = Curl_ssl_cf_get_config(cf, data); - CURLcode result = ssl_config->certinfo ? + CURLcode result = ssl_config && ssl_config->certinfo ? CURLE_PEER_FAILED_VERIFICATION : CURLE_OK; int i, count; + if(!ssl_config) { + failf(data, "Cert collect failed: ssl_config"); + return CURLE_PEER_FAILED_VERIFICATION; + } if(!show_verbose_server_cert && !ssl_config->certinfo) return CURLE_OK; @@ -868,8 +872,10 @@ mbed_connect_step2(struct Curl_cfilter *cf, struct Curl_easy *data) if(peercert) { const CURLcode result = collect_server_cert(cf, data, peercert); - if(result) + if(result) { + failf(data, "Cert collect failed: %d", result); return result; + } } if(peercert && data->set.verbose) {