[svn] Windows update from Herold Heiko.

diff --git a/ChangeLog b/ChangeLog
index dba0049b60007f4e67ac088fe1a76923d017f642..cd91db2ebf37767e1370703fe7c9c406d5ba6391 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * po/hr.po: Updated Croatian translation.

diff --git a/src/ChangeLog b/src/ChangeLog
index 496f462384c42d72a9aa97e85465370ad97c25eb..6ad6e599e7dc93d630b6c896fc55b3e8cfbd90c5 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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>
 
        * url.c (local_quote_string): Reenable quoting of question marks,

diff --git a/src/gen_sslfunc.c b/src/gen_sslfunc.c
index 5ef5105063fc3e6f59581b98eb76c6f0df3cac9a..f32e7d80ca7b1a1d67a59ff170b1c9e919bd781d 100644 (file)
--- a/src/gen_sslfunc.c
+++ b/src/gen_sslfunc.c
@@ -70,6 +70,7 @@ ssl_init_prng (void)
       RAND_seed((unsigned char *)&t, sizeof(time_t));
       /* Initialize system's random number generator */
       RAND_bytes((unsigned char *)&seed, sizeof(long));
+#ifndef WINDOWS
       srand48(seed);
       while (RAND_status () == 0)
        {
@@ -78,6 +79,12 @@ ssl_init_prng (void)
          l = lrand48();
          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)
        {
          /* Write a rand_file */

diff --git a/windows/Makefile.src b/windows/Makefile.src
index 35c7c847771695a649d86f87bcaf9f98ea2e77f5..ab7cd5b5bc6add182802747c6a706edea3c021bf 100644 (file)
--- a/windows/Makefile.src
+++ b/windows/Makefile.src
@@ -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 \
       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 \
-      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 \
       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 \
-      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
 

diff --git a/windows/Makefile.src.bor b/windows/Makefile.src.bor
index 9608c30dee314f590611cb8ff64eeddd9155817c..3bdb4cc221bfad4300bb75bcab680f6bba0b4125 100644 (file)
--- a/windows/Makefile.src.bor
+++ b/windows/Makefile.src.bor
@@ -32,6 +32,7 @@ progress.obj+
 netrc.obj+
 mswindows.obj+
 gnu-md5.obj+
+gen-md5.obj+
 main.obj+
 log.obj+
 init.obj+