From e4ba999646ed7a974813ecf8405651d300554eba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Antoniak?= Date: Thu, 25 Feb 2021 20:47:35 +0100 Subject: vtls: deduplicate some DISABLE_PROXY ifdefs continue from #5735 - using SSL_HOST_NAME, SSL_HOST_DISPNAME, SSL_PINNED_PUB_KEY for other tls backend - create SSL_HOST_PORT Closes #6660 --- lib/vtls/bearssl.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'lib/vtls/bearssl.c') diff --git a/lib/vtls/bearssl.c b/lib/vtls/bearssl.c index a63056d4e..673e3863a 100644 --- a/lib/vtls/bearssl.c +++ b/lib/vtls/bearssl.c @@ -300,12 +300,7 @@ static CURLcode bearssl_connect_step1(struct Curl_easy *data, 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 char * const hostname = SSL_HOST_NAME(); const bool verifypeer = SSL_CONN_CONFIG(verifypeer); const bool verifyhost = SSL_CONN_CONFIG(verifyhost); CURLcode ret; -- cgit v1.2.1