[openssl] master update

[kaishen.yy at antfin.com]

The branch master has been updated
       via  94bd168a9e31d1ab4986e94056dfae71ec5f051f (commit)
      from  41f7ecf30dc9c1bd6988accc0aa288571a25b7bd (commit)


- Log -----------------------------------------------------------------
commit 94bd168a9e31d1ab4986e94056dfae71ec5f051f
Author: Paul Yang <kaishen.yy at antfin.com>
Date:   Mon Sep 30 11:33:24 2019 +0800

    Fix a return value bug in apps/speed.c
    
    Those functions returns less than and equal to 0 to indicate an error
    occured.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10054)

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

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

diff --git a/apps/speed.c b/apps/speed.c
index 59594f0e49..33f77d3b2c 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -3249,8 +3249,8 @@ int speed_main(int argc, char **argv)
 
             if ((ed_pctx = EVP_PKEY_CTX_new_id(test_ed_curves[testnum].nid, NULL))
                     == NULL
-                || !EVP_PKEY_keygen_init(ed_pctx)
-                || !EVP_PKEY_keygen(ed_pctx, &ed_pkey)) {
+                || EVP_PKEY_keygen_init(ed_pctx) <= 0
+                || EVP_PKEY_keygen(ed_pctx, &ed_pkey) <= 0) {
                 st = 0;
                 EVP_PKEY_CTX_free(ed_pctx);
                 break;