Patches from Vern Staats <staatsvr@asc.hpc.mil> to get Kerberos 5 in

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

diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index 9ccf4663cb0dc345d4ddc8766388a5afb5804498..982074c465ba4547a61d969073b0e21e5ba4e9a1 100644 (file)
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -61,6 +61,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "e_os.h"
+#include <openssl/crypto.h>
+#include <openssl/rand.h>
+
 #ifdef OPENSSL_SYS_VMS
 #include <unixio.h>
 #endif
@@ -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
@@ -194,7 +194,7 @@ 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=NULL;
        char *ret=NULL;
@@ -211,6 +211,12 @@ const char *RAND_file_name(char *buf, int 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, int size)
                        strcat(buf,RFILE);
                        ret=buf;
                        }
-                 else
+               else
                        buf[0] = '\0'; /* no file name */
                }
        return(ret);