1 files changed, 7 insertions, 9 deletions

diff --git a/src/lib/libcrypto/rand/randfile.c b/src/lib/libcrypto/rand/randfile.c
index 6c0ec9a41c..d847d8ebdf 100644
--- a/src/lib/libcrypto/rand/randfile.c
+++ b/src/lib/libcrypto/rand/randfile.c
@@ -102,8 +102,10 @@ int RAND_load_file(const char *file, long bytes)
 
         if (file == NULL) return(0);
 
-        if (stat(file,&sb) < 0) return(0);
-        RAND_add(&sb,sizeof(sb),0.0);
+        i=stat(file,&sb);
+        /* If the state fails, put some crap in anyway */
+        RAND_add(&sb,sizeof(sb),0);
+        if (i < 0) return(0);
         if (bytes == 0) return(ret);
 
         in=fopen(file,"rb");
@@ -126,12 +128,8 @@ int RAND_load_file(const char *file, long bytes)
                         n = BUFSIZE;
                 i=fread(buf,1,n,in);
                 if (i <= 0) break;
-#ifdef PURIFY
-                RAND_add(buf,i,(double)i);
-#else
                 /* even if n != i, use the full array */
-                RAND_add(buf,n,(double)i);
-#endif
+                RAND_add(buf,n,i);
                 ret+=i;
                 if (bytes > 0)
                         {
@@ -235,7 +233,7 @@ const char *RAND_file_name(char *buf, size_t size)
         struct stat sb;
 #endif
 
-        if (OPENSSL_issetugid() == 0)
+        if (issetugid() == 0)
                 s=getenv("RANDFILE");
         if (s != NULL && *s && strlen(s) + 1 < size)
                 {
@@ -244,7 +242,7 @@ const char *RAND_file_name(char *buf, size_t size)
                 }
         else
                 {
-                if (OPENSSL_issetugid() == 0)
+                if (issetugid() == 0)
                         s=getenv("HOME");
 #ifdef DEFAULT_HOME
                 if (s == NULL)