luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

curl: deprecate --random-file and --egd-file

Browse Source 
As libcurl no longer has any functionality for them, the tool now does
nothing with them.

Closes #8670
This commit is contained in:
Daniel Stenberg 2022-05-17 11:06:07 +02:00
parent 8d86718f3f
commit 84052154f7
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
6 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/cmdline-opts/egd-file.d
View File

@ -7,5 +7,8 @@ Category: tls
Example: --egd-file /random/here $URL
Added: 7.7
---
Deprecated option. This option is ignored by curl since 7.84.0. Prior to that
it only had an effect on curl if built to use old versions of OpenSSL.
Specify the path name to the Entropy Gathering Daemon socket. The socket is
used to seed the random engine for SSL connections.

6
docs/cmdline-opts/random-file.d
View File

@ -6,6 +6,8 @@ Example: --random-file rubbish $URL
Added: 7.7
See-also: egd-file
---
Deprecated option. This option is ignored by curl since 7.84.0. Prior to that
it only had an effect on curl if built to use old versions of OpenSSL.
Specify the path name to file containing what will be considered as random
data. The data may be used to seed the random engine for SSL connections. See
also the --egd-file option.
data. The data may be used to seed the random engine for SSL connections.

2
src/tool_cfgable.c
View File

@ -52,8 +52,6 @@ static void free_config_fields(struct OperationConfig *config)
{
struct getout *urlnode;
Curl_safefree(config->random_file);
Curl_safefree(config->egd_file);
Curl_safefree(config->useragent);
Curl_safefree(config->altsvc);
Curl_safefree(config->hsts);

2
src/tool_cfgable.h
View File

@ -50,8 +50,6 @@ struct State {
struct OperationConfig {
bool remote_time;
char *random_file;
char *egd_file;
char *useragent;
struct curl_slist *cookies; /* cookies to serialize into a single line */
char *cookiejar; /* write to this file */

2
src/tool_getparam.c
View File

@ -667,10 +667,8 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
GetStr(&config->dns_ipv6_addr, nextarg);
break;
case 'a': /* random-file */
GetStr(&config->random_file, nextarg);
break;
case 'b': /* egd-file */
GetStr(&config->egd_file, nextarg);
break;
case 'B': /* OAuth 2.0 bearer token */
GetStr(&config->oauth_bearer, nextarg);

2
src/tool_operate.c
View File

@ -1824,8 +1824,6 @@ static CURLcode single_transfer(struct GlobalConfig *global,
my_setopt_slist(curl, CURLOPT_TELNETOPTIONS, config->telnet_options);
/* new in libcurl 7.7: */
my_setopt_str(curl, CURLOPT_RANDOM_FILE, config->random_file);
my_setopt_str(curl, CURLOPT_EGDSOCKET, config->egd_file);
my_setopt(curl, CURLOPT_CONNECTTIMEOUT_MS,
(long)(config->connecttimeout * 1000));