diff options
author | Bob Beck <beck@cvs.openbsd.org> | 2000-04-16 23:50:13 +0000 |
---|---|---|
committer | Bob Beck <beck@cvs.openbsd.org> | 2000-04-16 23:50:13 +0000 |
commit | dd2859329eb1bfaa672d451630b4f0cff4204e3a (patch) | |
tree | 56d540e167e18e228a37d882f9fea44ead436fed /lib/libcrypto | |
parent | 804f9f2c9221f8f82fcbee4dea21a5b61a967d32 (diff) |
Fix strcpy/strcat abuse and fix stupid behaviour of the default
RAND_file_name - changed so that it stats the filename it returns
before returing it. If the file won't stat, return DEVRANDOM (for us
/dev/arandom) instead, thus making the default behaviour moderately
intelligent.
Diffstat (limited to 'lib/libcrypto')
-rw-r--r-- | lib/libcrypto/rand/randfile.c | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/lib/libcrypto/rand/randfile.c b/lib/libcrypto/rand/randfile.c index c3a0c12c580..53a75667f49 100644 --- a/lib/libcrypto/rand/randfile.c +++ b/lib/libcrypto/rand/randfile.c @@ -218,6 +218,7 @@ const char *RAND_file_name(char *buf, int size) { char *s; char *ret=NULL; + struct stat sb; s=getenv("RANDFILE"); if (s != NULL) @@ -229,15 +230,31 @@ const 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); + if (s == NULL) + ret = RFILE; + if (((int)(strlen(s)+strlen(RFILE)+2)) > size) + ret=RFILE; + else + { + strlcpy(buf,s,size); #ifndef VMS - strcat(buf,"/"); + strcat(buf,"/"); #endif - strcat(buf,RFILE); - ret=buf; + strlcat(buf,RFILE,size); + ret=buf; + } } +#ifdef DEVRANDOM + /* 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 DEVRANDOM instead. the allows the user to + * use their own source for good random data, but defaults + * to something hopefully decent if that isn't available. + */ + + if (stat(ret,&sb) == -1) + ret = DEVRANDOM; +#endif return(ret); } + |