Some platforms (most notably Windows) do not have a $HOME by default.

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

diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index 02f16aa810329d28ee698dc51a05130f37645c9a..982074c465ba4547a61d969073b0e21e5ba4e9a1 100644 (file)
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -61,7 +61,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef VMS
+#include "e_os.h"
+#include <openssl/crypto.h>
+#include <openssl/rand.h>
+
+#ifdef OPENSSL_SYS_VMS
 #include <unixio.h>
 #endif
 #ifndef NO_SYS_TYPES_H
@@ -73,10 +77,6 @@
 # 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(WIN32)
+#if defined(O_CREAT) && !defined(OPENSSL_SYS_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 VMS
+#ifdef OPENSSL_SYS_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 /* VMS */
+#endif /* OPENSSL_SYS_VMS */
 
        fclose(out);
        memset(buf,0,BUFSIZE);
@@ -194,12 +194,13 @@ err:
        return (rand_err ? -1 : ret);
        }
 
-const char *RAND_file_name(char *buf, int size)
+const char *RAND_file_name(char *buf, size_t size)
        {
-       char *s;
+       char *s=NULL;
        char *ret=NULL;
 
-       s=getenv("RANDFILE");
+       if (OPENSSL_issetugid() == 0)
+               s=getenv("RANDFILE");
        if (s != NULL)
                {
                strncpy(buf,s,size-1);
@@ -208,16 +209,25 @@ const char *RAND_file_name(char *buf, int size)
                }
        else
                {
-               s=getenv("HOME");
-               if (s == NULL) return(RFILE);
-               if (((int)(strlen(s)+strlen(RFILE)+2)) > size)
-                       return(RFILE);
-               strcpy(buf,s);
-#ifndef VMS
-               strcat(buf,"/");
+               if (OPENSSL_issetugid() == 0)
+                       s=getenv("HOME");
+#ifdef DEFAULT_HOME
+               if (s == NULL)
+                       {
+                       s = DEFAULT_HOME;
+                       }
 #endif
-               strcat(buf,RFILE);
-               ret=buf;
+               if (s != NULL && (strlen(s)+strlen(RFILE)+2 < size))
+                       {
+                       strcpy(buf,s);
+#ifndef OPENSSL_SYS_VMS
+                       strcat(buf,"/");
+#endif
+                       strcat(buf,RFILE);
+                       ret=buf;
+                       }
+               else
+                       buf[0] = '\0'; /* no file name */
                }
        return(ret);
        }