Clean up RAND_bytes() calls
authorTodd Short <tshort@akamai.com>
Tue, 24 May 2016 12:55:12 +0000 (08:55 -0400)
committerTodd Short <tshort@akamai.com>
Tue, 24 May 2016 12:55:12 +0000 (08:55 -0400)
When RAND_pseudo_bytes() was replaced with RAND_bytes(), this case
was not reduced to a simple RAND_bytes() call.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1117)

crypto/bn/bn_rand.c

index 1dd07e789c96d8d0090111f39abb145166c36104..9c0a4eef06fedc22a3ebb7ee8ccb1c38e6f37863 100644 (file)
@@ -44,13 +44,8 @@ static int bnrand(int pseudorand, BIGNUM *rnd, int bits, int top, int bottom)
     time(&tim);
     RAND_add(&tim, sizeof(tim), 0.0);
 
-    if (pseudorand) {
-        if (RAND_bytes(buf, bytes) <= 0)
-            goto err;
-    } else {
-        if (RAND_bytes(buf, bytes) <= 0)
-            goto err;
-    }
+    if (RAND_bytes(buf, bytes) <= 0)
+        goto err;
 
     if (pseudorand == 2) {
         /*