diff options
| author | Bodo Möller <bodo@openssl.org> | 1999-10-26 01:56:29 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 1999-10-26 01:56:29 +0000 |
| commit | a31011e8e0ea18f1cc79d7eb53238768ae9369c6 (patch) | |
| tree | da6c9af95c39c6e6c44d2b71ace3bd4495728be1 /crypto/rand/randfile.c | |
| parent | 38899535f85784442395aeab921b25fc79266491 (diff) | |
Various randomness handling bugfixes and improvements --
some utilities that should have used RANDFILE did not,
and -rand handling was broken except in genrsa.
Diffstat (limited to 'crypto/rand/randfile.c')
| -rw-r--r-- | crypto/rand/randfile.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c index e1ed4e3a98..942a963e83 100644 --- a/crypto/rand/randfile.c +++ b/crypto/rand/randfile.c @@ -78,7 +78,7 @@ #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(const char *file, long bytes) { @@ -119,7 +119,7 @@ int RAND_write_file(const char *file) { unsigned char buf[BUFSIZE]; int i,ret=0; - FILE *out; + FILE *out = NULL; int n; /* Under VMS, fopen(file, "wb") will create a new version of the @@ -130,12 +130,22 @@ int RAND_write_file(const char *file) out=fopen(file,"rb+"); if (out == NULL #ifdef ENOENT - && errno == ENOENT + && errno == ENOENT #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) goto err; #ifndef NO_CHMOD |