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

For those, unless the environment variables RANDFILE or HOME are
defined (the default case!), RAND_file_name() will return NULL.
This change adds a default HOME for those platforms.

To add a default HOME for any platform, just define DEFAULT_HOME in
the proper place, wrapped in appropriate #ifdef..#endif, in e_os.h.

diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index 7548ac324c05e105aeeefe99772d0fb3c3d0a63b..c2ae28c3a2a48a9afc0a34dec74680e28484972a 100644 (file)
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -211,6 +211,12 @@ 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);
@@ -220,7 +226,7 @@ const char *RAND_file_name(char *buf, size_t size)
                        strcat(buf,RFILE);
                        ret=buf;
                        }
-                 else
+               else
                        buf[0] = '\0'; /* no file name */
                }
        return(ret);

diff --git a/e_os.h b/e_os.h
index 4f9c983ef18475bece8782e45e30768f5aed1c81..8a996096be6dd380ae60bb686a33240c5be5d9fc 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -224,6 +224,7 @@ extern "C" {
 #  define SSLEAY_CONF  OPENSSL_CONF
 #  define NUL_DEV      "nul"
 #  define RFILE                ".rnd"
+#  define DEFAULT_HOME  "C:"
 
 #else /* The non-microsoft world world */