From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 17 May 2022 09:06:07 +0000 (+0200)
Subject: curl: deprecate --random-file and --egd-file
X-Git-Tag: curl-7_84_0~181
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=84052154f7988af1290fffb90ccf2ecb4f230943;p=thirdparty%2Fcurl.git

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

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

Closes #8670
---

diff --git a/docs/cmdline-opts/egd-file.d b/docs/cmdline-opts/egd-file.d
index cd3450a214..76031f2eb3 100644
--- a/docs/cmdline-opts/egd-file.d
+++ b/docs/cmdline-opts/egd-file.d
@@ -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.
diff --git a/docs/cmdline-opts/random-file.d b/docs/cmdline-opts/random-file.d
index fe56f574fa..d41b00140e 100644
--- a/docs/cmdline-opts/random-file.d
+++ b/docs/cmdline-opts/random-file.d
@@ -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.
diff --git a/src/tool_cfgable.c b/src/tool_cfgable.c
index ecc266a065..c56e86f5e4 100644
--- a/src/tool_cfgable.c
+++ b/src/tool_cfgable.c
@@ -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);
diff --git a/src/tool_cfgable.h b/src/tool_cfgable.h
index c7cbab4bd7..058bbd41c5 100644
--- a/src/tool_cfgable.h
+++ b/src/tool_cfgable.h
@@ -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 */
diff --git a/src/tool_getparam.c b/src/tool_getparam.c
index cff1839b03..020567565e 100644
--- a/src/tool_getparam.c
+++ b/src/tool_getparam.c
@@ -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);
diff --git a/src/tool_operate.c b/src/tool_operate.c
index 67de59c0a7..e977cce7ad 100644
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -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));