Skip to content

Commit

Permalink
temp
Browse files Browse the repository at this point in the history
  • Loading branch information
sergio-nsk committed Apr 21, 2024
1 parent 897a85e commit 50a3213
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/linux.yml
Expand Up @@ -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
Expand Down
10 changes: 8 additions & 2 deletions lib/vtls/mbedtls.c
Expand Up @@ -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;

Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 50a3213

Please sign in to comment.