Avoid race condition.

[oweals/openssl.git] / crypto / rand / randfile.c

diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index 8623e13e18ee0dc4e27eedaa286f26afde190a8b..c2ae28c3a2a48a9afc0a34dec74680e28484972a 100644 (file)
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -61,11 +61,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "e_os.h"
-#include <openssl/crypto.h>
-#include <openssl/rand.h>
-
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 #include <unixio.h>
 #endif
 #ifndef NO_SYS_TYPES_H
@@ -77,6 +73,10 @@
 # include <sys/stat.h>
 #endif
 
+#include "openssl/e_os.h"
+#include <openssl/crypto.h>
+#include <openssl/rand.h>
+
 #undef BUFSIZE
 #define BUFSIZE        1024
 #define RAND_DATA 1024
@@ -136,7 +136,7 @@ int RAND_write_file(const char *file)
        FILE *out = NULL;
        int n;
        
-#if defined(O_CREAT) && !defined(OPENSSL_SYS_WIN32)
+#if defined(O_CREAT) && !defined(WIN32)
        /* For some reason Win32 can't write to files created this way */
        
        /* chmod(..., 0600) is too late to protect the file,
@@ -168,7 +168,7 @@ int RAND_write_file(const char *file)
                ret+=i;
                if (n <= 0) break;
                 }
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
        /* Try to delete older versions of the file, until there aren't
           any */
        {
@@ -186,7 +186,7 @@ int RAND_write_file(const char *file)
                                      some point... */
                }
        }
-#endif /* OPENSSL_SYS_VMS */
+#endif /* VMS */
 
        fclose(out);
        memset(buf,0,BUFSIZE);
@@ -211,16 +211,22 @@ const char *RAND_file_name(char *buf, size_t size)
                {
                if (OPENSSL_issetugid() == 0)
                        s=getenv("HOME");
+#ifdef DEFAULT_HOME
+               if (s == NULL)
+                       {
+                       s = DEFAULT_HOME;
+                       }
+#endif
                if (s != NULL && (strlen(s)+strlen(RFILE)+2 < size))
                        {
                        strcpy(buf,s);
-#ifndef OPENSSL_SYS_VMS
+#ifndef VMS
                        strcat(buf,"/");
 #endif
                        strcat(buf,RFILE);
                        ret=buf;
                        }
-                 else
+               else
                        buf[0] = '\0'; /* no file name */
                }
        return(ret);