Skip to content

Commit 92c0650

Browse files
committed
Also fix the CLI
1 parent 426feda commit 92c0650

3 files changed

Lines changed: 14 additions & 8 deletions

File tree

bin/curl_firefox133

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,5 @@ dir=${0%/*}
3333
--tls-record-size-limit 4001 \
3434
--tls-key-shares-limit 3 \
3535
--cert-compression zlib,brotli,zstd \
36+
--tls-use-firefox-tls13-ciphers \
3637
"$@"

bin/curl_firefox135

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,5 @@ dir=${0%/*}
3434
--tls-key-shares-limit 3 \
3535
--cert-compression zlib,brotli,zstd \
3636
--tls-signed-cert-timestamps \
37+
--tls-use-firefox-tls13-ciphers \
3738
"$@"

patches/curl.patch

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4148,7 +4148,7 @@ index 75fef60c8..3ed59525b 100644
41484148
long happy_eyeballs_timeout_ms; /* happy eyeballs timeout in milliseconds.
41494149
0 is valid. default: CURL_HET_DEFAULT. */
41504150
diff --git a/src/tool_getparam.c b/src/tool_getparam.c
4151-
index a55973a60..29fec1ea8 100644
4151+
index a55973a60..30885daac 100644
41524152
--- a/src/tool_getparam.c
41534153
+++ b/src/tool_getparam.c
41544154
@@ -90,6 +90,7 @@ static ParameterError getstrn(char **str, const char *val,
@@ -4188,7 +4188,7 @@ index a55973a60..29fec1ea8 100644
41884188
{"silent", ARG_BOOL, 's', C_SILENT},
41894189
{"skip-existing", ARG_BOOL, ' ', C_SKIP_EXISTING},
41904190
{"socks4", ARG_STRG, ' ', C_SOCKS4},
4191-
@@ -341,8 +350,17 @@ static const struct LongShort aliases[]= {
4191+
@@ -341,8 +350,18 @@ static const struct LongShort aliases[]= {
41924192
{"tftp-blksize", ARG_STRG, ' ', C_TFTP_BLKSIZE},
41934193
{"tftp-no-options", ARG_BOOL, ' ', C_TFTP_NO_OPTIONS},
41944194
{"time-cond", ARG_STRG, 'z', C_TIME_COND},
@@ -4202,11 +4202,12 @@ index a55973a60..29fec1ea8 100644
42024202
+ {"tls-record-size-limit", ARG_STRG, ' ', C_TLS_RECORD_SIZE_LIMIT}, // curl-impersonate
42034203
+ {"tls-session-ticket", ARG_BOOL, ' ', C_TLS_SESSION_TICKET}, // curl-impersonate
42044204
+ {"tls-signed-cert-timestamps", ARG_BOOL, ' ', C_TLS_SIGNED_CERT_TIMESTAMPS}, // curl-impersonate
4205+
+ {"tls-use-firefox-tls13-ciphers", ARG_BOOL, ' ', C_TLS_USE_FIREFOX_TLS13_CIPHERS}, // curl-impersonate
42054206
+ {"tls-use-new-alps-codepoint", ARG_BOOL, ' ', C_TLS_USE_NEW_ALPS_CODEPOINT}, // curl-impersonate
42064207
{"tls13-ciphers", ARG_STRG|ARG_TLS, ' ', C_TLS13_CIPHERS},
42074208
{"tlsauthtype", ARG_STRG|ARG_TLS, ' ', C_TLSAUTHTYPE},
42084209
{"tlspassword", ARG_STRG|ARG_TLS, ' ', C_TLSPASSWORD},
4209-
@@ -1864,7 +1882,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
4210+
@@ -1864,7 +1883,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
42104211
/* if given a blank string, make it NULL again */
42114212
curlx_safefree(config->doh_url);
42124213
break;
@@ -4215,7 +4216,7 @@ index a55973a60..29fec1ea8 100644
42154216
err = getstr(&config->cipher_list, nextarg, DENY_BLANK);
42164217
break;
42174218
case C_DNS_INTERFACE: /* --dns-interface */
4218-
@@ -1913,6 +1931,9 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
4219+
@@ -1913,6 +1932,9 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
42194220
case C_ALPN: /* --alpn */
42204221
config->noalpn = !toggle;
42214222
break;
@@ -4225,7 +4226,7 @@ index a55973a60..29fec1ea8 100644
42254226
case C_LIMIT_RATE: /* --limit-rate */
42264227
err = GetSizeParameter(global, nextarg, "rate", &value);
42274228
if(!err) {
4228-
@@ -2294,6 +2315,33 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
4229+
@@ -2294,6 +2316,36 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
42294230
case C_TLS_MAX: /* --tls-max */
42304231
err = str2tls_max(&config->ssl_version_max, nextarg);
42314232
break;
@@ -4255,11 +4256,14 @@ index a55973a60..29fec1ea8 100644
42554256
+ break;
42564257
+ case C_TLS_USE_NEW_ALPS_CODEPOINT: /* --tls-use-new-alps-codepoint curl-impersonate */
42574258
+ config->tls_use_new_alps_codepoint = toggle;
4259+
+ break;
4260+
+ case C_TLS_USE_FIREFOX_TLS13_CIPHERS: /* --tls-use-new-alps-codepoint curl-impersonate */
4261+
+ config->tls_use_firefox_tls13_ciphers = toggle;
42584262
+ break;
42594263
case C_SUPPRESS_CONNECT_HEADERS: /* --suppress-connect-headers */
42604264
config->suppress_connect_headers = toggle;
42614265
break;
4262-
@@ -2343,6 +2391,39 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
4266+
@@ -2343,6 +2395,39 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
42634267
return PARAM_LIBCURL_DOESNT_SUPPORT;
42644268
sethttpver(global, config, CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE);
42654269
break;
@@ -4299,7 +4303,7 @@ index a55973a60..29fec1ea8 100644
42994303
case C_HTTP3: /* --http3: */
43004304
/* Try HTTP/3, allow fallback */
43014305
if(!feature_http3)
4302-
@@ -2477,6 +2558,9 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
4306+
@@ -2477,6 +2562,9 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
43034307
GetFileAndPassword(nextarg, &config->cert, &config->key_passwd);
43044308
cleanarg(clearthis);
43054309
break;
@@ -4309,7 +4313,7 @@ index a55973a60..29fec1ea8 100644
43094313
case C_CACERT: /* --cacert */
43104314
err = getstr(&config->cacert, nextarg, DENY_BLANK);
43114315
break;
4312-
@@ -2885,6 +2969,9 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
4316+
@@ -2885,6 +2973,9 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
43134317
case C_SKIP_EXISTING: /* --skip-existing */
43144318
config->skip_existing = toggle;
43154319
break;

0 commit comments

Comments
 (0)