moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

[svn] --sslegdsock' -> --egd-file'

Browse Source 
Published in <sxsadwwnc7h.fsf@florida.arsdigita.de>.
This commit is contained in:
hniksic 2001-12-05 21:35:17 -08:00
parent e16c0ba78e
commit fcf68c0e9a
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ChangeLog
View File

@ -1,3 +1,11 @@
2001-12-06 Hrvoje Niksic <hniksic@arsdigita.com>
* gen_sslfunc.c (ssl_init_prng): Allow the user to disable EGD by
setting egd_file it to empty string.
* main.c (main): Change the option name from --sslegdsock to
--egd-file.
2001-12-06 Hrvoje Niksic <hniksic@arsdigita.com>
* gen_sslfunc.c (ssl_init_prng): Make the printed message

2
src/gen_sslfunc.c
View File

@ -73,7 +73,7 @@ ssl_init_prng (void)
return;
/* Get random data from EGD if opt.sslegdsock was set. */
if (opt.sslegdsock)
if (opt.sslegdsock && *opt.sslegdsock)
RAND_egd (opt.sslegdsock);
if (RAND_status ())

5
src/init.c
View File

@ -179,7 +179,7 @@ static struct {
#ifdef HAVE_SSL
{ "sslcertfile", &opt.sslcertfile, cmd_file },
{ "sslcertkey", &opt.sslcertkey, cmd_file },
{ "sslegdsock", &opt.sslegdsock, cmd_file },
{ "egdfile", &opt.sslegdsock, cmd_file },
#endif /* HAVE_SSL */
{ "timeout", &opt.timeout, cmd_time },
{ "timestamping", &opt.timestamping, cmd_boolean },
@ -670,6 +670,9 @@ cmd_file (const char *com, const char *val, void *closure)
char **pstring = (char **)closure;
FREE_MAYBE (*pstring);
/* #### If VAL is empty, perhaps should set *CLOSURE to NULL. */
if (!enable_tilde_expansion || !(*val == '~' && *(val + 1) == '/'))
{
noexpand:

6
src/main.c
View File

@ -150,7 +150,7 @@ Logging and input file:\n\
-B, --base=URL prepends URL to relative links in -F -i file.\n\
--sslcertfile=FILE optional client certificate.\n\
--sslcertkey=KEYFILE optional keyfile for this certificate.\n\
--sslegdsock=FILE socket to the egd daemon(random data source).\n\
--egd-file=FILE file name of the EGD socket.\n\
\n"), stdout);
fputs (_("\
Download:\n\
@ -324,7 +324,7 @@ main (int argc, char *const *argv)
#ifdef HAVE_SSL
{ "sslcertfile", required_argument, NULL, 158 },
{ "sslcertkey", required_argument, NULL, 159 },
{ "sslegdsock", required_argument, NULL, 166 },
{ "egd-file", required_argument, NULL, 166 },
#endif /* HAVE_SSL */
{ "wait", required_argument, NULL, 'w' },
{ "waitretry", required_argument, NULL, 152 },
@ -546,7 +546,7 @@ GNU General Public License for more details.\n"));
setval ("sslcertkey", optarg);
break;
case 166:
setval ("sslegdsock", optarg);
setval ("egdfile", optarg);
break;
#endif /* HAVE_SSL */
case 'A':