diff options
| author | Haibo Huang <hhb@google.com> | 2020-10-28 22:18:23 -0700 |
|---|---|---|
| committer | Haibo Huang <hhb@google.com> | 2020-11-11 14:04:46 -0800 |
| commit | b5a52b921a9e7144aa95b8dff2d66732c2a8efff (patch) | |
| tree | 5d8dc61c3642298f09b9916bb6a8df99630852d4 /lib/vtls/vtls.h | |
| parent | 963b4486efcc9e99b5e50bdfb2562f1c9f536682 (diff) | |
| download | external_curl-b5a52b921a9e7144aa95b8dff2d66732c2a8efff.tar.gz external_curl-b5a52b921a9e7144aa95b8dff2d66732c2a8efff.tar.bz2 external_curl-b5a52b921a9e7144aa95b8dff2d66732c2a8efff.zip | |
Upgrade curl to curl-7_73_0
Test: make
Change-Id: Ib063c45f52a3c6892447f92e44043a14f01a917a
Diffstat (limited to 'lib/vtls/vtls.h')
| -rw-r--r-- | lib/vtls/vtls.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/lib/vtls/vtls.h b/lib/vtls/vtls.h index bcc84441..b86bdbc1 100644 --- a/lib/vtls/vtls.h +++ b/lib/vtls/vtls.h @@ -131,12 +131,26 @@ CURLcode Curl_none_md5sum(unsigned char *input, size_t inputlen, CURL_SOCKET_BAD ? FIRSTSOCKET : SECONDARYSOCKET].state) #define SSL_SET_OPTION(var) \ (SSL_IS_PROXY() ? data->set.proxy_ssl.var : data->set.ssl.var) +#define SSL_SET_OPTION_LVALUE(var) \ + (*(SSL_IS_PROXY() ? &data->set.proxy_ssl.var : &data->set.ssl.var)) #define SSL_CONN_CONFIG(var) \ (SSL_IS_PROXY() ? conn->proxy_ssl_config.var : conn->ssl_config.var) +#define SSL_HOST_NAME() \ + (SSL_IS_PROXY() ? conn->http_proxy.host.name : conn->host.name) +#define SSL_HOST_DISPNAME() \ + (SSL_IS_PROXY() ? conn->http_proxy.host.dispname : conn->host.dispname) +#define SSL_PINNED_PUB_KEY() (SSL_IS_PROXY() \ + ? data->set.str[STRING_SSL_PINNEDPUBLICKEY_PROXY] \ + : data->set.str[STRING_SSL_PINNEDPUBLICKEY_ORIG]) #else #define SSL_IS_PROXY() FALSE #define SSL_SET_OPTION(var) data->set.ssl.var +#define SSL_SET_OPTION_LVALUE(var) data->set.ssl.var #define SSL_CONN_CONFIG(var) conn->ssl_config.var +#define SSL_HOST_NAME() conn->host.name +#define SSL_HOST_DISPNAME() conn->host.dispname +#define SSL_PINNED_PUB_KEY() \ + data->set.str[STRING_SSL_PINNEDPUBLICKEY_ORIG] #endif bool Curl_ssl_config_matches(struct ssl_primary_config *data, @@ -221,7 +235,7 @@ CURLcode Curl_ssl_addsessionid(struct connectdata *conn, * take sessionid object ownership from sessionid cache * (e.g. decrement refcount). */ -void Curl_ssl_kill_session(struct curl_ssl_session *session); +void Curl_ssl_kill_session(struct Curl_ssl_session *session); /* delete a session from the cache * Sessionid mutex must be locked (see Curl_ssl_sessionid_lock). * This will call engine-specific curlssl_session_free function, which must |