X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=e_os.h;h=7d94b8245d5551fa595dd9b4db4898870aff23c3;hb=916704b3c6256955e6df5141437a1a809d3539d8;hp=8e6efa9616cfa97734e3bebff699ceca49202e3c;hpb=99992ad22019e752c7b103a45f860a48b6bc0972;p=oweals%2Fopenssl.git diff --git a/e_os.h b/e_os.h index 8e6efa9616..7d94b8245d 100644 --- a/e_os.h +++ b/e_os.h @@ -27,10 +27,9 @@ * set this to a comma-separated list of 'random' device files to try out. By * default, we will try to read at least one of these files */ -# if defined(__s390__) -# define DEVRANDOM "/dev/prandom","/dev/urandom","/dev/hwrng","/dev/random" -# else -# define DEVRANDOM "/dev/urandom","/dev/random","/dev/srandom" +# define DEVRANDOM "/dev/urandom", "/dev/random", "/dev/hwrng", "/dev/srandom" +# ifdef __linux +# define DEVRANDOM_WAIT "/dev/random" # endif # endif # if !defined(OPENSSL_NO_EGD) && !defined(DEVRANDOM_EGD) @@ -39,7 +38,7 @@ * sockets will be tried in the order listed in case accessing the device * files listed in DEVRANDOM did not return enough randomness. */ -# define DEVRANDOM_EGD "/var/run/egd-pool","/dev/egd-pool","/etc/egd-pool","/etc/entropy" +# define DEVRANDOM_EGD "/var/run/egd-pool", "/dev/egd-pool", "/etc/egd-pool", "/etc/entropy" # endif # if defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI)