1 files changed, 8 insertions, 18 deletions

diff --git a/src/lib/libcrypto/rand/randfile.c b/src/lib/libcrypto/rand/randfile.c
index f5d0843d13..cfbec2ac1f 100644
--- a/src/lib/libcrypto/rand/randfile.c
+++ b/src/lib/libcrypto/rand/randfile.c
@@ -56,9 +56,6 @@
  * [including the GNU Public Licence.]
  */
 
-/* We need to define this to get macros like S_IFBLK and S_IFCHR */
-#define _XOPEN_SOURCE 1
-
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -67,7 +64,6 @@
 #include "e_os.h"
 #include <openssl/crypto.h>
 #include <openssl/rand.h>
-#include <openssl/buffer.h>
 
 #ifdef OPENSSL_SYS_VMS
 #include <unixio.h>
@@ -110,7 +106,6 @@ int RAND_load_file(const char *file, long bytes)
 
         in=fopen(file,"rb");
         if (in == NULL) goto err;
-#if defined(S_IFBLK) && defined(S_IFCHR)
         if (sb.st_mode & (S_IFBLK | S_IFCHR)) {
           /* this file is a device. we don't want read an infinite number
            * of bytes from a random device, nor do we want to use buffered
@@ -119,7 +114,6 @@ int RAND_load_file(const char *file, long bytes)
           bytes = (bytes == -1) ? 2048 : bytes; /* ok, is 2048 enough? */
           setvbuf(in, NULL, _IONBF, 0); /* don't do buffered reads */
         }
-#endif
         for (;;)
                 {
                 if (bytes > 0)
@@ -153,7 +147,6 @@ int RAND_write_file(const char *file)
         
         i=stat(file,&sb);
         if (i != -1) { 
-#if defined(S_IFBLK) && defined(S_IFCHR)
           if (sb.st_mode & (S_IFBLK | S_IFCHR)) {
             /* this file is a device. we don't write back to it. 
              * we "succeed" on the assumption this is some sort 
@@ -162,7 +155,6 @@ int RAND_write_file(const char *file)
              */
             return(1); 
           }
-#endif
         }
 
 #if defined(O_CREAT) && !defined(OPENSSL_SYS_WIN32)
@@ -227,20 +219,18 @@ const char *RAND_file_name(char *buf, size_t size)
         {
         char *s=NULL;
         int ok = 0;
-#ifdef __OpenBSD__
         struct stat sb;
-#endif
 
-        if (OPENSSL_issetugid() == 0)
+        if (issetugid() == 0)
                 s=getenv("RANDFILE");
         if (s != NULL && *s && strlen(s) + 1 < size)
                 {
-                if (BUF_strlcpy(buf,s,size) >= size)
+                if (strlcpy(buf,s,size) >= size)
                         return NULL;
                 }
         else
                 {
-                if (OPENSSL_issetugid() == 0)
+                if (issetugid() == 0)
                         s=getenv("HOME");
 #ifdef DEFAULT_HOME
                 if (s == NULL)
@@ -250,11 +240,11 @@ const char *RAND_file_name(char *buf, size_t size)
 #endif
                 if (s && *s && strlen(s)+strlen(RFILE)+2 < size)
                         {
-                        BUF_strlcpy(buf,s,size);
+                        strlcpy(buf,s,size);
 #ifndef OPENSSL_SYS_VMS
-                        BUF_strlcat(buf,"/",size);
+                        strlcat(buf,"/",size);
 #endif
-                        BUF_strlcat(buf,RFILE,size);
+                        strlcat(buf,RFILE,size);
                         ok = 1;
                         }
                 else
@@ -270,11 +260,11 @@ const char *RAND_file_name(char *buf, size_t size)
          */
 
         if (!ok)
-                if (BUF_strlcpy(buf,"/dev/arandom",size) >= size) {
+                if (strlcpy(buf,"/dev/arandom",size) >= size) {
                         return(NULL);
                 }       
         if (stat(buf,&sb) == -1)
-                if (BUF_strlcpy(buf,"/dev/arandom",size) >= size) {
+                if (strlcpy(buf,"/dev/arandom",size) >= size) {
                         return(NULL);
                 }