setopt: add TLS 1.3 ciphersuites

Adds CURLOPT_TLS13_CIPHERS and CURLOPT_PROXY_TLS13_CIPHERS.

curl: added --tls13-ciphers and --proxy-tls13-ciphers

Fixes #2435
Reported-by: zzq1015 on github
Closes #2607

1 files changed, 10 insertions, 6 deletions

diff --git a/src/tool_help.c b/src/tool_help.c
index 7c4dda3b0..3218cf67d 100644
--- a/src/tool_help.c
+++ b/src/tool_help.c
@@ -160,12 +160,12 @@ static const struct helptxt helptext[] = {
    "Put the post data in the URL and use GET"},
   {"-g, --globoff",
    "Disable URL sequences and ranges using {} and []"},
-  {"    --happy-eyeballs-timeout-ms",
+  {"    --happy-eyeballs-timeout-ms <milliseconds>",
    "How long to wait in milliseconds for IPv6 before trying IPv4"},
-  {"-I, --head",
-   "Show document info only"},
   {"    --haproxy-protocol",
    "Send HAProxy PROXY protocol v1 header"},
+  {"-I, --head",
+   "Show document info only"},
   {"-H, --header <header/@file>",
    "Pass custom header(s) to server"},
   {"-h, --help",
@@ -297,7 +297,7 @@ static const struct helptxt helptext[] = {
   {"    --proxy-cert <cert[:passwd]>",
    "Set client certificate for proxy"},
   {"    --proxy-cert-type <type>",
-   "Client certificate type for HTTS proxy"},
+   "Client certificate type for HTTPS proxy"},
   {"    --proxy-ciphers <list>",
    "SSL ciphers to use for proxy"},
   {"    --proxy-crlfile <file>",
@@ -324,6 +324,8 @@ static const struct helptxt helptext[] = {
    "SPNEGO proxy service name"},
   {"    --proxy-ssl-allow-beast",
    "Allow security flaw for interop for HTTPS proxy"},
+  {"    --proxy-tls13-ciphers <ciphersuite list>",
+   "TLS 1.3 proxy cipher suites"},
   {"    --proxy-tlsauthtype <type>",
    "TLS authentication type for HTTPS proxy"},
   {"    --proxy-tlspassword <string>",
@@ -337,7 +339,7 @@ static const struct helptxt helptext[] = {
   {"    --proxy1.0 <host[:port]>",
    "Use HTTP/1.0 proxy on given port"},
   {"-p, --proxytunnel",
-   "Operate through a HTTP proxy tunnel (using CONNECT)"},
+   "Operate through an HTTP proxy tunnel (using CONNECT)"},
   {"    --pubkey <key>",
    "SSH Public key file name"},
   {"-Q, --quote",
@@ -362,7 +364,7 @@ static const struct helptxt helptext[] = {
    "Specify request command to use"},
   {"    --request-target",
    "Specify the target for this request"},
-  {"    --resolve <host:port:address>",
+  {"    --resolve <host:port:address[,address]...>",
    "Resolve the host+port to this address"},
   {"    --retry <num>",
    "Retry request if transient problems occur"},
@@ -432,6 +434,8 @@ static const struct helptxt helptext[] = {
    "Transfer based on a time condition"},
   {"    --tls-max <VERSION>",
    "Use TLSv1.0 or greater"},
+  {"    --tls13-ciphers <list of TLS 1.3 ciphersuites>",
+   "TLS 1.3 cipher suites to use"},
   {"    --tlsauthtype <type>",
    "TLS authentication type"},
   {"    --tlspassword",