Fixed the return code of RAND_query_egd_bytes when connect fails.
authorganesh <ganeshbhambarkar@gmail.com>
Wed, 9 Nov 2016 15:14:22 +0000 (20:44 +0530)
committerRichard Levitte <levitte@openssl.org>
Tue, 24 Jan 2017 13:39:20 +0000 (14:39 +0100)
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1886)

crypto/rand/rand_egd.c

index fb6bad7..5fb230f 100644 (file)
@@ -133,6 +133,7 @@ int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes)
                 break;
 #  endif
             default:
+                ret = -1;
                 goto err;       /* failure */
             }
         }
@@ -230,9 +231,7 @@ int RAND_egd_bytes(const char *path, int bytes)
     int num, ret = 0;
 
     num = RAND_query_egd_bytes(path, NULL, bytes);
-    if (num < 1)
-        goto err;
-    if (RAND_status() == 1)
+    if (num < 1 || RAND_status() == 1)
         ret = num;
  err:
     return (ret);