1
0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00

[svn] Windows update from Herold Heiko.

This commit is contained in:
hniksic 2001-12-04 02:33:18 -08:00
parent b5b08b8110
commit f70c9c6ede
5 changed files with 23 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2001-12-04 Herold Heiko <Heiko.Herold@previnet.it>
* windows\Makefile.src: add gen_sslfunc.c
* windows\Makefile.src.bor: ditto.
2001-12-01 Hrvoje Niksic <hniksic@arsdigita.com> 2001-12-01 Hrvoje Niksic <hniksic@arsdigita.com>
* po/hr.po: Updated Croatian translation. * po/hr.po: Updated Croatian translation.

View File

@ -1,3 +1,10 @@
2001-12-04 Herold Heiko <Heiko.Herold@previnet.it>
* gen_sslfunc.c: on windows provide ssl crypto random
initialization through RAND_screen(); could possibly
be not enough for strong ssl communication (see the
relevant manual page from the openssl package).
2001-12-04 Hrvoje Niksic <hniksic@arsdigita.com> 2001-12-04 Hrvoje Niksic <hniksic@arsdigita.com>
* url.c (local_quote_string): Reenable quoting of question marks, * url.c (local_quote_string): Reenable quoting of question marks,

View File

@ -70,6 +70,7 @@ ssl_init_prng (void)
RAND_seed((unsigned char *)&t, sizeof(time_t)); RAND_seed((unsigned char *)&t, sizeof(time_t));
/* Initialize system's random number generator */ /* Initialize system's random number generator */
RAND_bytes((unsigned char *)&seed, sizeof(long)); RAND_bytes((unsigned char *)&seed, sizeof(long));
#ifndef WINDOWS
srand48(seed); srand48(seed);
while (RAND_status () == 0) while (RAND_status () == 0)
{ {
@ -78,6 +79,12 @@ ssl_init_prng (void)
l = lrand48(); l = lrand48();
RAND_seed((unsigned char *)&l, sizeof(long)); RAND_seed((unsigned char *)&l, sizeof(long));
} }
#else /* WINDOWS */
RAND_screen();
if (RAND_status() == 0)
/* Here we should probably disable the whole ssl protocol ? HEH */
DEBUGP (("SSL random data generator not seeded correctly, %i",RAND_status()));
#endif /* WINDOWS */
if (rand_file != NULL) if (rand_file != NULL)
{ {
/* Write a rand_file */ /* Write a rand_file */

View File

@ -55,12 +55,12 @@ RM = del
SRC = cmpt.c safe-ctype.c connect.c host.c http.c netrc.c ftp-basic.c ftp.c \ SRC = cmpt.c safe-ctype.c connect.c host.c http.c netrc.c ftp-basic.c ftp.c \
ftp-ls.c ftp-opie.c getopt.c hash.c headers.c html-parse.c html-url.c \ ftp-ls.c ftp-opie.c getopt.c hash.c headers.c html-parse.c html-url.c \
progress.c retr.c recur.c res.c url.c cookies.c init.c utils.c main.c \ progress.c retr.c recur.c res.c url.c cookies.c init.c utils.c main.c \
version.c mswindows.c fnmatch.c gnu-md5.c rbuf.c log.c $(SSLSRC) version.c mswindows.c fnmatch.c gen-md5.c gnu-md5.c rbuf.c log.c $(SSLSRC)
OBJ = cmpt$o safe-ctype$o connect$o host$o http$o netrc$o ftp-basic$o ftp$o \ OBJ = cmpt$o safe-ctype$o connect$o host$o http$o netrc$o ftp-basic$o ftp$o \
ftp-ls$o ftp-opie$o getopt$o hash$o headers$o html-parse$o html-url$o \ ftp-ls$o ftp-opie$o getopt$o hash$o headers$o html-parse$o html-url$o \
progress$o retr$o recur$o res$o url$o cookies$o init$o utils$o main$o \ progress$o retr$o recur$o res$o url$o cookies$o init$o utils$o main$o \
version$o mswindows$o fnmatch$o gnu-md5$o rbuf$o log$o $(SSLOBJ) version$o mswindows$o fnmatch$o gen-md5$o gnu-md5$o rbuf$o log$o $(SSLOBJ)
.SUFFIXES: .c .obj .SUFFIXES: .c .obj

View File

@ -32,6 +32,7 @@ progress.obj+
netrc.obj+ netrc.obj+
mswindows.obj+ mswindows.obj+
gnu-md5.obj+ gnu-md5.obj+
gen-md5.obj+
main.obj+ main.obj+
log.obj+ log.obj+
init.obj+ init.obj+