From: Andy Polyakov <appro@openssl.org>
Date: Tue, 20 Sep 2016 15:06:58 +0000 (+0200)
Subject: rand/randfile.c: rationalize __OpenBSD__ code path.
X-Git-Tag: OpenSSL_1_1_1-pre1~3481
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=ba8fa4e53a35a0c46d1e0e81a4d270a026fac2b9;hp=799c1293fcf412db64dcc8a09a6b11cc755914dc

rand/randfile.c: rationalize __OpenBSD__ code path.

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index 16cc27aa9b..dfec2c7d6b 100644
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -357,11 +357,7 @@ const char *RAND_file_name(char *buf, size_t size)
      * available.
      */
 
-    if (!buf[0])
-        if (OPENSSL_strlcpy(buf, "/dev/arandom", size) >= size) {
-            return NULL;
-        }
-    if (stat(buf, &sb) == -1)
+    if (!buf[0] || stat(buf, &sb) == -1)
         if (OPENSSL_strlcpy(buf, "/dev/arandom", size) >= size) {
             return NULL;
         }