Incorporate some changes that make OpenSSL compilable in CygWin.

[oweals/openssl.git] / apps / app_rand.c

diff --git a/apps/app_rand.c b/apps/app_rand.c
index 2126fd5aa1981d9795454eeb8cb407f511ec7bf5..8a78e12eb732855b445c3e56f9f92c25bda2e8c3 100644 (file)
--- a/apps/app_rand.c
+++ b/apps/app_rand.c
@@ -142,21 +142,18 @@ int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn)
                }
        if (file == NULL || !RAND_load_file(file, -1))
                {
-               if (RAND_status() == 0)
+               if (RAND_status() == 0 && !dont_warn)
                        {
-                       if (!dont_warn)
+                       BIO_printf(bio_e,"unable to load 'random state'\n");
+                       BIO_printf(bio_e,"This means that the random number generator has not been seeded\n");
+                       BIO_printf(bio_e,"with much random data.\n");
+                       if (consider_randfile) /* explanation does not apply when a file is explicitly named */
                                {
-                               BIO_printf(bio_e,"unable to load 'random state'\n");
-                               BIO_printf(bio_e,"This means that the random number generator has not been seeded\n");
-                               BIO_printf(bio_e,"with much random data.\n");
-                               if (consider_randfile) /* explanation does not apply when a file is explicitly named */
-                                       {
-                                       BIO_printf(bio_e,"Consider setting the RANDFILE environment variable to point at a file that\n");
-                                       BIO_printf(bio_e,"'random' data can be kept in (the file will be overwritten).\n");
-                                       }
+                               BIO_printf(bio_e,"Consider setting the RANDFILE environment variable to point at a file that\n");
+                               BIO_printf(bio_e,"'random' data can be kept in (the file will be overwritten).\n");
                                }
-                       return 0;
                        }
+               return 0;
                }
        seeded = 1;
        return 1;
@@ -180,8 +177,10 @@ long app_RAND_load_files(char *name)
                if (*n == '\0') break;
 
                egd=RAND_egd(n);
-               if (egd > 0) tot+=egd;
-               tot+=RAND_load_file(n,-1);
+               if (egd > 0)
+                       tot+=egd;
+               else
+                       tot+=RAND_load_file(n,-1);
                if (last) break;
                }
        if (tot > 512)