From: Paul Yang <kaishen.yy@antfin.com>
Date: Mon, 30 Sep 2019 03:33:24 +0000 (+0800)
Subject: Fix a return value bug in apps/speed.c
X-Git-Tag: OpenSSL_1_1_1e~210
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=312674e5148a44843202040006f47fc374902f88;p=oweals%2Fopenssl.git

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@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10054)

(cherry picked from commit 94bd168a9e31d1ab4986e94056dfae71ec5f051f)
---

diff --git a/apps/speed.c b/apps/speed.c
index 20149506cc..7f8ba7c096 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -3106,8 +3106,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;