OpenSSL 0.9.7 stable 2002 05 08 merge

1 files changed, 13 insertions, 13 deletions

diff --git a/src/lib/libcrypto/rand/randfile.c b/src/lib/libcrypto/rand/randfile.c
index c4eb79ac5f..4b221e08f5 100644
--- a/src/lib/libcrypto/rand/randfile.c
+++ b/src/lib/libcrypto/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
@@ -158,7 +158,7 @@ int RAND_write_file(const char *file)
           }
         }
 
-#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,
@@ -190,7 +190,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 */
         {
@@ -208,7 +208,7 @@ int RAND_write_file(const char *file)
                                       some point... */
                 }
         }
-#endif /* VMS */
+#endif /* OPENSSL_SYS_VMS */
 
         fclose(out);
         memset(buf,0,BUFSIZE);
@@ -242,7 +242,7 @@ const char *RAND_file_name(char *buf, size_t size)
                 if (s && *s && strlen(s)+strlen(RFILE)+2 < size)
                         {
                         strlcpy(buf,s,size);
-#ifndef VMS
+#ifndef OPENSSL_SYS_VMS
                         strcat(buf,"/");
 #endif
                         strlcat(buf,RFILE,size);
@@ -252,20 +252,20 @@ const char *RAND_file_name(char *buf, size_t size)
                         buf[0] = '\0'; /* no file name */
                 }
 
-#ifdef DEVRANDOM
+#ifdef __OpenBSD__
         /* given that all random loads just fail if the file can't be 
          * seen on a stat, we stat the file we're returning, if it
-         * fails, use DEVRANDOM instead. this allows the user to 
+         * fails, use /dev/arandom instead. this allows the user to 
          * use their own source for good random data, but defaults
          * to something hopefully decent if that isn't available. 
          */
 
         if (!ok)
-                if (strlcpy(buf,DEVRANDOM,size) >= size) {
+                if (strlcpy(buf,"/dev/arandom",size) >= size) {
                         return(NULL);
                 }       
         if (stat(buf,&sb) == -1)
-                if (strlcpy(buf,DEVRANDOM,size) >= size) {
+                if (strlcpy(buf,"/dev/arandom",size) >= size) {
                         return(NULL);
                 }