root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

rand/rand_unix.c: omit error from DSO_global_lookup. 

If built with no-dso, DSO_global_lookup leaves "unsupported" message
in error queue. Since there is a fall-back code, it's unnecessary
distraction.

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
(Merged from https://github.com/openssl/openssl/pull/6436)
This commit is contained in:
Andy Polyakov 2018-06-08 11:03:32 +02:00
parent 55fc247a69
commit 46ceca3c91
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/rand/rand_unix.c
View File

@ -247,7 +247,9 @@ int syscall_random(void *buf, size_t buflen)
* - Linux since 3.17 with glibc 2.25 * - Linux since 3.17 with glibc 2.25
* - FreeBSD since 12.0 (1200061) * - FreeBSD since 12.0 (1200061)
*/ */
ERR_set_mark();
p_getentropy.p = DSO_global_lookup("getentropy"); p_getentropy.p = DSO_global_lookup("getentropy");
ERR_pop_to_mark();
if (p_getentropy.p != NULL) if (p_getentropy.p != NULL)
return p_getentropy.f(buf, buflen) == 0 ? buflen : 0; return p_getentropy.f(buf, buflen) == 0 ? buflen : 0;