Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
curl: make --libcurl output better CURLOPT_*SSLVERSION
The option is really two enums ORed together, so it needs special attention to make the code output nice. Added test 1481 to verify. Both the server and the proxy versions. Reported-by: Boris Verkhovskiy Fixes #13127 Closes #13129
- Loading branch information
Showing
5 changed files
with
187 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,118 @@ | ||
<testcase> | ||
<info> | ||
<keywords> | ||
HTTP | ||
HTTP GET | ||
--libcurl | ||
</keywords> | ||
</info> | ||
|
||
# Server-side | ||
<reply> | ||
<data> | ||
HTTP/1.1 200 OK | ||
Date: Thu, 29 Jul 2008 14:49:00 GMT | ||
Server: test-server/fake | ||
Content-Length: 0 | ||
Connection: close | ||
|
||
</data> | ||
</reply> | ||
|
||
# Client-side | ||
<client> | ||
<server> | ||
http | ||
</server> | ||
<features> | ||
proxy | ||
ssl | ||
</features> | ||
<name> | ||
--libcurl with TLS version options | ||
</name> | ||
<setenv> | ||
SSL_CERT_FILE= | ||
</setenv> | ||
<command> | ||
http://moo/ --libcurl %LOGDIR/test%TESTNUMBER.c --tls-max 1.3 --proxy-tlsv1 -x http://%HOSTIP:%HTTPPORT | ||
</command> | ||
</client> | ||
|
||
# Verify data after the test has been "shot" | ||
<verify> | ||
<protocol> | ||
GET http://moo/ HTTP/1.1 | ||
Host: moo | ||
User-Agent: curl/%VERSION | ||
Accept: */* | ||
Proxy-Connection: Keep-Alive | ||
|
||
</protocol> | ||
<stripfile> | ||
s/(USERAGENT, \")[^\"]+/${1}stripped/ | ||
# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with | ||
# CURLOPT_INTERLEAVEDATA requires RTSP protocol | ||
# configurations - just ignore them | ||
$_ = '' if /CURLOPT_SSL_VERIFYPEER/ | ||
$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/ | ||
$_ = '' if /CURLOPT_HTTP_VERSION/ | ||
$_ = '' if /CURLOPT_HTTP09_ALLOWED/ | ||
$_ = '' if /CURLOPT_INTERLEAVEDATA/ | ||
</stripfile> | ||
<file name="%LOGDIR/test%TESTNUMBER.c" mode="text"> | ||
/********* Sample code generated by the curl command line tool ********** | ||
* All curl_easy_setopt() options are documented at: | ||
* https://curl.se/libcurl/c/curl_easy_setopt.html | ||
************************************************************************/ | ||
#include <curl/curl.h> | ||
|
||
int main(int argc, char *argv[]) | ||
{ | ||
CURLcode ret; | ||
CURL *hnd; | ||
|
||
hnd = curl_easy_init(); | ||
curl_easy_setopt(hnd, CURLOPT_BUFFERSIZE, 102400L); | ||
curl_easy_setopt(hnd, CURLOPT_URL, "http://moo/"); | ||
curl_easy_setopt(hnd, CURLOPT_PROXY, "http://%HOSTIP:%HTTPPORT"); | ||
curl_easy_setopt(hnd, CURLOPT_USERAGENT, "stripped"); | ||
curl_easy_setopt(hnd, CURLOPT_MAXREDIRS, 50L); | ||
curl_easy_setopt(hnd, CURLOPT_SSLVERSION, (long)(CURL_SSLVERSION_DEFAULT | CURL_SSLVERSION_MAX_TLSv1_3)); | ||
curl_easy_setopt(hnd, CURLOPT_PROXY_SSLVERSION, (long)(CURL_SSLVERSION_TLSv1 | CURL_SSLVERSION_MAX_NONE)); | ||
curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L); | ||
%if ftp | ||
curl_easy_setopt(hnd, CURLOPT_FTP_SKIP_PASV_IP, 1L); | ||
%endif | ||
curl_easy_setopt(hnd, CURLOPT_TCP_KEEPALIVE, 1L); | ||
|
||
/* Here is a list of options the curl code used that cannot get generated | ||
as source easily. You may choose to either not use them or implement | ||
them yourself. | ||
|
||
CURLOPT_WRITEDATA was set to an object pointer | ||
CURLOPT_WRITEFUNCTION was set to a function pointer | ||
CURLOPT_READDATA was set to an object pointer | ||
CURLOPT_READFUNCTION was set to a function pointer | ||
CURLOPT_SEEKDATA was set to an object pointer | ||
CURLOPT_SEEKFUNCTION was set to a function pointer | ||
CURLOPT_ERRORBUFFER was set to an object pointer | ||
CURLOPT_STDERR was set to an object pointer | ||
CURLOPT_DEBUGFUNCTION was set to a function pointer | ||
CURLOPT_DEBUGDATA was set to an object pointer | ||
CURLOPT_HEADERFUNCTION was set to a function pointer | ||
CURLOPT_HEADERDATA was set to an object pointer | ||
|
||
*/ | ||
|
||
ret = curl_easy_perform(hnd); | ||
|
||
curl_easy_cleanup(hnd); | ||
hnd = NULL; | ||
|
||
return (int)ret; | ||
} | ||
/**** End of sample code ****/ | ||
</file> | ||
</verify> | ||
</testcase> |