Make sure an error condition is returned if, for some reason, the file

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

diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index cea9f54e731388f1e4209ca60649fb2ee0d18835..cc73c799fd04b886babebaa531d663658d0e30d0 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
@@ -72,6 +75,7 @@
 # include <sys/stat.h>
 #endif
 
+#include <openssl/crypto.h>
 #include <openssl/rand.h>
 
 #undef BUFSIZE
@@ -134,9 +138,15 @@ int RAND_write_file(const char *file)
        /* 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
 #endif
 
        if (out == NULL)
@@ -147,11 +157,17 @@ int RAND_write_file(const char *file)
                int fd = open(file, O_CREAT | O_EXCL, 0600);
                if (fd != -1)
                        out = fdopen(fd, "wb");
-#else          
-               out=fopen(file,"wb");
+               else /* the open(...) reportedly fails on Win98 w/ VisualC */
+                       out = fopen(file,"wb");
+#else
+               out = fopen(file,"wb");
 #endif
                }
-       if (out == NULL) goto err;
+       if (out == NULL)
+               {
+               err=1;
+               goto err;
+               }
 #ifndef NO_CHMOD
        chmod(file,0600);
 #endif
@@ -174,8 +190,28 @@ int RAND_write_file(const char *file)
 #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 */
+       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
 #endif
 
        fclose(out);
@@ -184,7 +220,7 @@ err:
        return(err ? -1 : ret);
        }
 
-char *RAND_file_name(char *buf, int size)
+const char *RAND_file_name(char *buf, int size)
        {
        char *s;
        char *ret=NULL;