diff options
author | Daniel Stenberg <daniel@haxx.se> | 2021-02-18 10:13:56 +0100 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2021-02-19 08:07:19 +0100 |
commit | 70472a44deaff387cf8c8c197e04f3add2a96e2e (patch) | |
tree | 3363e99d282df02857c6d69013fdc969260f3b32 /lib/doh.c | |
parent | d25c479e8405dd255276a3345c8b1ae11d9419e1 (diff) | |
download | curl-70472a44deaff387cf8c8c197e04f3add2a96e2e.tar.gz |
urldata: remove the _ORIG suffix from string names
It doesn't provide any useful info but only makes the names longer.
Closes #6624
Diffstat (limited to 'lib/doh.c')
-rw-r--r-- | lib/doh.c | 28 |
1 files changed, 14 insertions, 14 deletions
@@ -307,27 +307,27 @@ static CURLcode dohprobe(struct Curl_easy *data, */ if(data->set.ssl.falsestart) ERROR_CHECK_SETOPT(CURLOPT_SSL_FALSESTART, 1L); - if(data->set.str[STRING_SSL_CAFILE_ORIG]) { + if(data->set.str[STRING_SSL_CAFILE]) { ERROR_CHECK_SETOPT(CURLOPT_CAINFO, - data->set.str[STRING_SSL_CAFILE_ORIG]); + data->set.str[STRING_SSL_CAFILE]); } - if(data->set.str[STRING_SSL_CAPATH_ORIG]) { + if(data->set.str[STRING_SSL_CAPATH]) { ERROR_CHECK_SETOPT(CURLOPT_CAPATH, - data->set.str[STRING_SSL_CAPATH_ORIG]); + data->set.str[STRING_SSL_CAPATH]); } - if(data->set.str[STRING_SSL_CRLFILE_ORIG]) { + if(data->set.str[STRING_SSL_CRLFILE]) { ERROR_CHECK_SETOPT(CURLOPT_CRLFILE, - data->set.str[STRING_SSL_CRLFILE_ORIG]); + data->set.str[STRING_SSL_CRLFILE]); } if(data->set.ssl.certinfo) ERROR_CHECK_SETOPT(CURLOPT_CERTINFO, 1L); if(data->set.str[STRING_SSL_RANDOM_FILE]) { ERROR_CHECK_SETOPT(CURLOPT_RANDOM_FILE, - data->set.str[STRING_SSL_RANDOM_FILE]); + data->set.str[STRING_SSL_RANDOM_FILE]); } if(data->set.str[STRING_SSL_EGDSOCKET]) { ERROR_CHECK_SETOPT(CURLOPT_EGDSOCKET, - data->set.str[STRING_SSL_EGDSOCKET]); + data->set.str[STRING_SSL_EGDSOCKET]); } if(data->set.ssl.fsslctx) ERROR_CHECK_SETOPT(CURLOPT_SSL_CTX_FUNCTION, data->set.ssl.fsslctx); @@ -335,21 +335,21 @@ static CURLcode dohprobe(struct Curl_easy *data, ERROR_CHECK_SETOPT(CURLOPT_SSL_CTX_DATA, data->set.ssl.fsslctxp); if(data->set.str[STRING_SSL_EC_CURVES]) { ERROR_CHECK_SETOPT(CURLOPT_SSL_EC_CURVES, - data->set.str[STRING_SSL_EC_CURVES]); + data->set.str[STRING_SSL_EC_CURVES]); } { long mask = (data->set.ssl.enable_beast ? - CURLSSLOPT_ALLOW_BEAST : 0) | + CURLSSLOPT_ALLOW_BEAST : 0) | (data->set.ssl.no_revoke ? - CURLSSLOPT_NO_REVOKE : 0) | + CURLSSLOPT_NO_REVOKE : 0) | (data->set.ssl.no_partialchain ? - CURLSSLOPT_NO_PARTIALCHAIN : 0) | + CURLSSLOPT_NO_PARTIALCHAIN : 0) | (data->set.ssl.revoke_best_effort ? - CURLSSLOPT_REVOKE_BEST_EFFORT : 0) | + CURLSSLOPT_REVOKE_BEST_EFFORT : 0) | (data->set.ssl.native_ca_store ? - CURLSSLOPT_NATIVE_CA : 0); + CURLSSLOPT_NATIVE_CA : 0); curl_easy_setopt(doh, CURLOPT_SSL_OPTIONS, mask); } |