Don't cheat: when only getting several bytes from each source, n is incremented

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

diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index 658a8d6b65f06050151105d9003be9cbf0a6d723..528e410f74009e82ccb922801d4bf316a5a90685 100644 (file)
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -61,8 +61,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "openssl/e_os.h"
-
 #ifdef VMS
 #include <unixio.h>
 #endif
@@ -75,6 +73,7 @@
 # include <sys/stat.h>
 #endif
 
+#include <openssl/e_os.h>
 #include <openssl/crypto.h>
 #include <openssl/rand.h>
 
@@ -130,38 +129,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. */
-       /* At the same time, if we just update a file, we also need to
-          truncate it, and unfortunately, ftruncate() and truncate() do
-          not exist everywhere.  All that remains is to delete old versions
-          of the random data file (done at the end). */
-#if 0
-       out=fopen(file,"rb+");
-       if (out == NULL && errno != ENOENT)
-               goto err;
-#endif
+       
+#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
@@ -171,7 +155,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)
                        {
@@ -180,20 +164,14 @@ 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 0
-       if (ret > 0)
-               ftruncate(fileno(out), ret);
-#else
        /* Try to delete older versions of the file, until there aren't
           any */
        {
        char *tmpf;
 
-       tmpf = Malloc(strlen(file) + 4);  /* to add ";-1" and a nul */
+       tmpf = OPENSSL_malloc(strlen(file) + 4);  /* to add ";-1" and a nul */
        if (tmpf)
                {
                strcpy(tmpf, file);
@@ -205,13 +183,12 @@ int RAND_write_file(const char *file)
                                      some point... */
                }
        }
-#endif
-#endif
+#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)