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 0a4005bd4e3f5b1308d13e64bfccb360e0dd1023..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,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,16 +211,22 @@ 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);
-#ifndef VMS
+#ifndef OPENSSL_SYS_VMS
                        strcat(buf,"/");
 #endif
                        strcat(buf,RFILE);
                        ret=buf;
                        }
-                 else
+               else
                        buf[0] = '\0'; /* no file name */
                }
        return(ret);