use <= instead of ==

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

diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index 1882d7df2cb4a6c683f764a0dac8c77facaa1637..02f16aa810329d28ee698dc51a05130f37645c9a 100644 (file)
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -61,8 +61,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "openssl/e_os.h"
-
+#ifdef VMS
+#include <unixio.h>
+#endif
 #ifndef NO_SYS_TYPES_H
 # include <sys/types.h>
 #endif
@@ -72,6 +73,8 @@
 # include <sys/stat.h>
 #endif
 
+#include <openssl/e_os.h>
+#include <openssl/crypto.h>
 #include <openssl/rand.h>
 
 #undef BUFSIZE
@@ -80,8 +83,14 @@
 
 /* #define RFILE ".rnd" - defined in ../../e_os.h */
 
+/* Note that these functions are intended for seed files only.
+ * Entropy devices and EGD sockets are handled in rand_unix.c */
+
 int RAND_load_file(const char *file, long bytes)
        {
+       /* If bytes >= 0, read up to 'bytes' bytes.
+        * if bytes == -1, read complete file. */
+
        MS_STATIC unsigned char buf[BUFSIZE];
        struct stat sb;
        int i,ret=0,n;
@@ -93,20 +102,26 @@ int RAND_load_file(const char *file, long bytes)
        /* If the state fails, put some crap in anyway */
        RAND_add(&sb,sizeof(sb),0);
        if (i < 0) return(0);
-       if (bytes <= 0) return(ret);
+       if (bytes == 0) return(ret);
 
        in=fopen(file,"rb");
        if (in == NULL) goto err;
        for (;;)
                {
-               n=(bytes < BUFSIZE)?(int)bytes:BUFSIZE;
+               if (bytes > 0)
+                       n = (bytes < BUFSIZE)?(int)bytes:BUFSIZE;
+               else
+                       n = BUFSIZE;
                i=fread(buf,1,n,in);
                if (i <= 0) break;
                /* even if n != i, use the full array */
                RAND_add(buf,n,i);
                ret+=i;
-               bytes-=n;
-               if (bytes <= 0) break;
+               if (bytes > 0)
+                       {
+                       bytes-=n;
+                       if (bytes <= 0) break;
+                       }
                }
        fclose(in);
        memset(buf,0,BUFSIZE);
@@ -117,32 +132,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
@@ -152,7 +158,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)
                        {
@@ -161,14 +167,34 @@ int RAND_write_file(const char *file)
                        }
                ret+=i;
                if (n <= 0) break;
+                }
+#ifdef VMS
+       /* 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);
        }
 
-char *RAND_file_name(char *buf, int size)
+const char *RAND_file_name(char *buf, int size)
        {
        char *s;
        char *ret=NULL;