don't print debug output

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

diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index 69cb5f4a05a90e1bc24f998b34ee3f155d7688f4..f6dc880fed5fdea0fb0c24169a9643ef34fd3bd0 100644 (file)
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -63,6 +63,9 @@
 
 #include "openssl/e_os.h"
 
+#ifdef VMS
+#include <unixio.h>
+#endif
 #ifndef NO_SYS_TYPES_H
 # include <sys/types.h>
 #endif
@@ -71,8 +74,8 @@
 #else
 # include <sys/stat.h>
 #endif
-#include OPENSSL_UNISTD
 
+#include <openssl/crypto.h>
 #include <openssl/rand.h>
 
 #undef BUFSIZE
@@ -127,32 +130,23 @@ err:
 int RAND_write_file(const char *file)
        {
        unsigned char buf[BUFSIZE];
-       int i,ret=0,err=0;
+       int i,ret=0,rand_err=0;
        FILE *out = NULL;
        int n;
-
-#ifdef VMS
-       /* Under VMS, fopen(file, "wb") will create a new version of the
-          same file.  This is not good, so let's try updating an existing
-          one, and create file only if it doesn't already exist. */
-       out=fopen(file,"rb+");
-       if (out == NULL && errno != ENOENT)
-               goto err;
+       
+#if defined(O_CREAT) && !defined(WIN32)
+       /* For some reason Win32 can't write to files created this way */
+       
+       /* chmod(..., 0600) is too late to protect the file,
+        * permissions should be restrictive from the start */
+       int fd = open(file, O_CREAT, 0600);
+       if (fd != -1)
+               out = fdopen(fd, "wb");
 #endif
-
        if (out == NULL)
-               {
-#if defined O_CREAT && defined O_EXCL
-               /* chmod(..., 0600) is too late to protect the file,
-                * permissions should be restrictive from the start */
-               int fd = open(file, O_CREAT | O_EXCL, 0600);
-               if (fd != -1)
-                       out = fdopen(fd, "wb");
-#else          
-               out=fopen(file,"wb");
-#endif
-               }
+               out = fopen(file,"wb");
        if (out == NULL) goto err;
+
 #ifndef NO_CHMOD
        chmod(file,0600);
 #endif
@@ -162,7 +156,7 @@ int RAND_write_file(const char *file)
                i=(n > BUFSIZE)?BUFSIZE:n;
                n-=BUFSIZE;
                if (RAND_bytes(buf,i) <= 0)
-                       err=1;
+                       rand_err=1;
                i=fwrite(buf,1,i,out);
                if (i <= 0)
                        {
@@ -171,18 +165,31 @@ int RAND_write_file(const char *file)
                        }
                ret+=i;
                if (n <= 0) break;
-               }
+                }
 #ifdef VMS
-       /* We may have updated an existing file using mode "rb+",
-        * now remove any old extra bytes */
-       if (ret > 0)
-               ftruncate(fileno(out), ret);
-#endif
+       /* Try to delete older versions of the file, until there aren't
+          any */
+       {
+       char *tmpf;
+
+       tmpf = OPENSSL_malloc(strlen(file) + 4);  /* to add ";-1" and a nul */
+       if (tmpf)
+               {
+               strcpy(tmpf, file);
+               strcat(tmpf, ";-1");
+               while(delete(tmpf) == 0)
+                       ;
+               rename(file,";1"); /* Make sure it's version 1, or we
+                                     will reach the limit (32767) at
+                                     some point... */
+               }
+       }
+#endif /* VMS */
 
        fclose(out);
        memset(buf,0,BUFSIZE);
 err:
-       return(err ? -1 : ret);
+       return (rand_err ? -1 : ret);
        }
 
 const char *RAND_file_name(char *buf, int size)