diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2020-07-09 08:14:49 +0300 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2020-07-12 16:22:38 +0200 |
| commit | 81bf2713aef90b565c1284f9b7f4a9ac34f2401c (patch) | |
| tree | 53e308e59bfba750c1b31670060d5f9edbaf692d | |
| parent | 250ec63f9760cac73cec24593d17f6fe7bbf61d4 (diff) | |
| download | curl-81bf2713aef90b565c1284f9b7f4a9ac34f2401c.tar.gz | |
bearssl: fix build with disabled proxy support
Avoid reference to fields that do not exist when CURL_DISABLE_PROXY is
defined.
Reviewed-by: Nicolas Sterchele
Closes #5666
| -rw-r--r-- | lib/vtls/bearssl.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/vtls/bearssl.c b/lib/vtls/bearssl.c index 628e16a12..44e7406e8 100644 --- a/lib/vtls/bearssl.c +++ b/lib/vtls/bearssl.c @@ -300,8 +300,12 @@ static CURLcode bearssl_connect_step1(struct connectdata *conn, int sockindex) struct ssl_connect_data *connssl = &conn->ssl[sockindex]; struct ssl_backend_data *backend = connssl->backend; const char * const ssl_cafile = SSL_CONN_CONFIG(CAfile); +#ifndef CURL_DISABLE_PROXY const char *hostname = SSL_IS_PROXY() ? conn->http_proxy.host.name : conn->host.name; +#else + const char *hostname = conn->host.name; +#endif const bool verifypeer = SSL_CONN_CONFIG(verifypeer); const bool verifyhost = SSL_CONN_CONFIG(verifyhost); CURLcode ret; @@ -386,8 +390,11 @@ static CURLcode bearssl_connect_step1(struct connectdata *conn, int sockindex) */ #ifdef USE_NGHTTP2 - if(data->set.httpversion >= CURL_HTTP_VERSION_2 && - (!SSL_IS_PROXY() || !conn->bits.tunnel_proxy)) { + if(data->set.httpversion >= CURL_HTTP_VERSION_2 +#ifndef CURL_DISABLE_PROXY + && (!SSL_IS_PROXY() || !conn->bits.tunnel_proxy) +#endif + ) { backend->protocols[cur++] = NGHTTP2_PROTO_VERSION_ID; infof(data, "ALPN, offering %s\n", NGHTTP2_PROTO_VERSION_ID); } |