6032b8f2a2
x2018
2025-10-23
Subject
vtls: unify the error handling in ssl_cf_connect().
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
lib/vtls/vtls.c+9 -6
| @@ -1365,6 +1365,15 @@ static CURLcode ssl_cf_connect(struct Curl_cfilter *cf, | |
| DEBUGASSERT(connssl); | |
| *done = FALSE; | |
| + | |
| + | if(!connssl->prefs_checked) { |
| + | if(!ssl_prefs_check(data)) { |
| + | result = CURLE_SSL_CONNECT_ERROR; |
| + | goto out; |
| + | } |
| + | connssl->prefs_checked = TRUE; |
| + | } |
| + | |
| if(!connssl->peer.hostname) { | |
| char tls_id[80]; | |
| connssl->ssl_impl->version(tls_id, sizeof(tls_id) - 1); | |
| @@ -1373,12 +1382,6 @@ static CURLcode ssl_cf_connect(struct Curl_cfilter *cf, | |
| goto out; | |
| } | |
| - | if(!connssl->prefs_checked) { |
| - | if(!ssl_prefs_check(data)) |
| - | return CURLE_SSL_CONNECT_ERROR; |
| - | connssl->prefs_checked = TRUE; |
| - | } |
| - | |
| result = connssl->ssl_impl->do_connect(cf, data, done); | |
| if(!result && *done) { | |