[openssl-commits] [openssl] master update

[matthias.st.pierre at ncp-e.com]

The branch master has been updated
       via  3445872e22735ff864d6b363d2d2b8acde740912 (commit)
      from  dc6c374bdb4872f6d5d727e73a2ed834e972842c (commit)


- Log -----------------------------------------------------------------
commit 3445872e22735ff864d6b363d2d2b8acde740912
Author: 捷成吴 <jasonwood2031 at gmail.com>
Date:   Sun Jun 24 15:28:33 2018 +0800

    apps/speed.c: add missing checks for RAND_bytes()
    
    Function RAND_bytes() may return 0 or -1 on error, simply
    goto end label when it fails.
    
    Fixes #6567
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/6582)

-----------------------------------------------------------------------

Summary of changes:
 apps/speed.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/speed.c b/apps/speed.c
index 768e3a1..181873c 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -2557,7 +2557,8 @@ int speed_main(int argc, char **argv)
     }
 
     for (i = 0; i < loopargs_len; i++)
-        RAND_bytes(loopargs[i].buf, 36);
+        if (RAND_bytes(loopargs[i].buf, 36) <= 0)
+            goto end;
 
 #ifndef OPENSSL_NO_RSA
     for (testnum = 0; testnum < RSA_NUM; testnum++) {
@@ -2653,7 +2654,8 @@ int speed_main(int argc, char **argv)
 #endif                          /* OPENSSL_NO_RSA */
 
     for (i = 0; i < loopargs_len; i++)
-        RAND_bytes(loopargs[i].buf, 36);
+        if (RAND_bytes(loopargs[i].buf, 36) <= 0)
+            goto end;
 
 #ifndef OPENSSL_NO_DSA
     for (testnum = 0; testnum < DSA_NUM; testnum++) {