X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Frand%2Frandfile.c;h=ec137c4e31db1f595c2040a58295764abf1d2c84;hp=cf98643d3c778b5a5a1a6f043ab5d01a204c27fe;hb=4981372d03a1fc051b59ba83fe2a2900519e8d8e;hpb=674b8eec4c5992714fd98389c90534c215000d75

diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index cf98643d3c..ec137c4e31 100644
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -61,8 +61,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "openssl/e_os.h"
+#include <openssl/e_os.h>
+#include <openssl/crypto.h>
+#include <openssl/rand.h>
 
+#ifdef OPENSSL_SYS_VMS
+#include <unixio.h>
+#endif
 #ifndef NO_SYS_TYPES_H
 # include <sys/types.h>
 #endif
@@ -72,16 +77,20 @@
 # include <sys/stat.h>
 #endif
 
-#include <openssl/rand.h>
-
 #undef BUFSIZE
 #define BUFSIZE	1024
 #define RAND_DATA 1024
 
 /* #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;
@@ -92,22 +101,27 @@ int RAND_load_file(const char *file, long bytes)
 	i=stat(file,&sb);
 	/* If the state fails, put some crap in anyway */
 	RAND_add(&sb,sizeof(sb),0);
-	ret+=sizeof(sb);
 	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);
@@ -118,36 +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;
-
-	/* 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.  This
-	   should be completely harmless on system that have no file
-	   versions.					-- Richard Levitte */
-	out=fopen(file,"rb+");
-	if (out == NULL
-#ifdef ENOENT
-	    && errno == ENOENT
+	
+#if defined(O_CREAT) && !defined(OPENSSL_SYS_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
-	   )
-		{
-		errno = 0;
-#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
-		}
+	if (out == NULL)
+		out = fopen(file,"wb");
 	if (out == NULL) goto err;
+
 #ifndef NO_CHMOD
 	chmod(file,0600);
 #endif
@@ -157,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)
 			{
@@ -166,21 +167,40 @@ int RAND_write_file(const char *file)
 			}
 		ret+=i;
 		if (n <= 0) break;
+                }
+#ifdef OPENSSL_SYS_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... */
 		}
-	if (ret > 0)
-		ftruncate(fileno(out), ret);
+	}
+#endif /* OPENSSL_SYS_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 *s=NULL;
 	char *ret=NULL;
 
-	s=getenv("RANDFILE");
+	if (OPENSSL_issetugid() == 0)
+		s=getenv("RANDFILE");
 	if (s != NULL)
 		{
 		strncpy(buf,s,size-1);
@@ -189,16 +209,19 @@ char *RAND_file_name(char *buf, int size)
 		}
 	else
 		{
-		s=getenv("HOME");
-		if (s == NULL) return(RFILE);
-		if (((int)(strlen(s)+strlen(RFILE)+2)) > size)
-			return(RFILE);
-		strcpy(buf,s);
-#ifndef VMS
-		strcat(buf,"/");
+		if (OPENSSL_issetugid() == 0)
+			s=getenv("HOME");
+		if (s != NULL && (strlen(s)+strlen(RFILE)+2 < size))
+			{
+			strcpy(buf,s);
+#ifndef OPENSSL_SYS_VMS
+			strcat(buf,"/");
 #endif
-		strcat(buf,RFILE);
-		ret=buf;
+			strcat(buf,RFILE);
+			ret=buf;
+			}
+		  else
+		  	buf[0] = '\0'; /* no file name */
 		}
 	return(ret);
 	}