[svn] Commit IPv6 support by Thomas Lussnig.

[wget] / src / gen_sslfunc.c

diff --git a/src/gen_sslfunc.c b/src/gen_sslfunc.c
index a782727f6ed225746e2a8a2b055a2d371c5c1bfb..da84492d5fdb968bac917375af55dd1d52f6181c 100644 (file)
--- a/src/gen_sslfunc.c
+++ b/src/gen_sslfunc.c
@@ -42,6 +42,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <openssl/rand.h>
 
 #include "wget.h"
+#include "utils.h"
 #include "connect.h"
 #include "url.h"
 
@@ -73,7 +74,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 ())
@@ -96,16 +97,16 @@ ssl_init_prng (void)
      security will use /dev/random or their own source of randomness
      anyway.  */
 
-  srand (time (NULL));
   while (RAND_status () == 0 && maxrand-- > 0)
     {
-      int rnd = rand ();
-      RAND_seed ((unsigned char *)&rnd, sizeof (rnd));
+      unsigned char rnd = random_number (256);
+      RAND_seed (&rnd, sizeof (rnd));
     }
 
   if (RAND_status () == 0)
     {
-      logprintf (LOG_NOTQUIET, "Could not seed OpenSSL PRNG; disabling SSL.\n");
+      logprintf (LOG_NOTQUIET,
+                _("Could not seed OpenSSL PRNG; disabling SSL.\n"));
       scheme_disable (SCHEME_HTTPS);
     }
 #endif /* SSLEAY_VERSION_NUMBER >= 0x00905100 */
@@ -124,7 +125,8 @@ init_ssl (SSL_CTX **ctx)
   meth = SSLv23_client_method ();
   *ctx = SSL_CTX_new (meth);
   SSL_CTX_set_verify (*ctx, verify, verify_callback);
-  if (*ctx == NULL) return SSLERRCTXCREATE;
+  if (*ctx == NULL) 
+    return SSLERRCTXCREATE;
   if (opt.sslcertfile)
     {
       if (SSL_CTX_use_certificate_file (*ctx, opt.sslcertfile,
@@ -220,9 +222,8 @@ ssl_iread (SSL *con, char *buf, int len)
   do
     {
 #ifdef HAVE_SELECT
-      if (opt.timeout)
+      if (opt.timeout && !SSL_pending (con))
        {
-         
          do
            {
              res = select_fd (fd, opt.timeout, 0);