Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

restore behaviour before the 0.9.7d import: fall back to /dev/urandom 

if ~/.rnd is not present.
(This code is with #ifdef __OpenBSD__ in openssl now; this change just
generalizes it.)
(approved by tls)
This commit is contained in:
drochner 2004-06-21 15:14:16 +00:00
parent 6b1f699323
commit 5e420ba772
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crypto/dist/openssl/crypto/rand/randfile.c vendored
View File

@ -227,7 +227,7 @@ const char *RAND_file_name(char *buf, size_t size)
{
char *s=NULL;
int ok = 0;
#ifdef __OpenBSD__
#if defined(__OpenBSD__) || defined(__NetBSD__)
struct stat sb;
#endif
@ -261,20 +261,25 @@ const char *RAND_file_name(char *buf, size_t size)
buf[0] = '\0'; /* no file name */
}
#if defined(__OpenBSD__) || defined(__NetBSD__)
#ifdef __OpenBSD__
#define FALLBACK "/dev/arandom"
#else
#define FALLBACK "/dev/urandom"
#endif
/* given that all random loads just fail if the file can't be
* seen on a stat, we stat the file we're returning, if it
* fails, use /dev/arandom instead. this allows the user to
* fails, use FALLBACK instead. this allows the user to
* use their own source for good random data, but defaults
* to something hopefully decent if that isn't available.
*/
if (!ok)
if (BUF_strlcpy(buf,"/dev/arandom",size) >= size) {
if (BUF_strlcpy(buf,FALLBACK,size) >= size) {
return(NULL);
}
if (stat(buf,&sb) == -1)
if (BUF_strlcpy(buf,"/dev/arandom",size) >= size) {
if (BUF_strlcpy(buf,FALLBACK,size) >= size) {
return(NULL);
}