* [including the GNU Public Licence.]
*/
+#include <errno.h>
#include <stdio.h>
-#include "cryptlib.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include "rand.h"
+#include <stdlib.h>
+#include <string.h>
+
+#include "openssl/e_os.h"
+
+#ifndef NO_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef MAC_OS_pre_X
+# include <stat.h>
+#else
+# include <sys/stat.h>
+#endif
+
+#include <openssl/rand.h>
#undef BUFSIZE
#define BUFSIZE 1024
#define RAND_DATA 1024
-/* #define RFILE ".rand" - defined in ../../e_os.h */
+/* #define RFILE ".rnd" - defined in ../../e_os.h */
-int RAND_load_file(file,bytes)
-char *file;
-long bytes;
+int RAND_load_file(const char *file, long bytes)
{
MS_STATIC unsigned char buf[BUFSIZE];
struct stat sb;
i=stat(file,&sb);
/* If the state fails, put some crap in anyway */
- RAND_seed((unsigned char *)&sb,sizeof(sb));
- ret+=sizeof(sb);
+ RAND_add(&sb,sizeof(sb),0);
if (i < 0) return(0);
if (bytes <= 0) return(ret);
- in=fopen(file,"br");
+ in=fopen(file,"rb");
if (in == NULL) goto err;
for (;;)
{
i=fread(buf,1,n,in);
if (i <= 0) break;
/* even if n != i, use the full array */
- RAND_seed(buf,n);
+ RAND_add(buf,n,i);
ret+=i;
bytes-=n;
if (bytes <= 0) break;
return(ret);
}
-int RAND_write_file(file)
-char *file;
+int RAND_write_file(const char *file)
{
unsigned char buf[BUFSIZE];
- int i,ret=0;
- FILE *out;
+ int i,ret=0,err=0;
+ FILE *out = NULL;
int n;
- out=fopen(file,"w");
+#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;
+#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
+ }
if (out == NULL) goto err;
+#ifndef NO_CHMOD
chmod(file,0600);
+#endif
n=RAND_DATA;
for (;;)
{
i=(n > BUFSIZE)?BUFSIZE:n;
n-=BUFSIZE;
- RAND_bytes(buf,i);
+ if (RAND_bytes(buf,i) <= 0)
+ err=1;
i=fwrite(buf,1,i,out);
if (i <= 0)
{
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
+
fclose(out);
memset(buf,0,BUFSIZE);
err:
- return(ret);
+ return(err ? -1 : ret);
}
-char *RAND_file_name(buf,size)
-char *buf;
-int size;
+char *RAND_file_name(char *buf, int size)
{
char *s;
char *ret=NULL;
if (((int)(strlen(s)+strlen(RFILE)+2)) > size)
return(RFILE);
strcpy(buf,s);
+#ifndef VMS
strcat(buf,"/");
+#endif
strcat(buf,RFILE);
ret=buf;
}