From: Nicola Tuveri <nic.tuv@gmail.com>
Date: Tue, 4 Oct 2016 12:56:49 +0000 (+0300)
Subject: Remove ECDH_EVP_derive_key wrapper function
X-Git-Tag: OpenSSL_1_1_1-pre1~3015
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=db1dd9368a153d6eac2256f86936207f9d777b32;p=oweals%2Fopenssl.git

Remove ECDH_EVP_derive_key wrapper function

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1658)
---

diff --git a/apps/speed.c b/apps/speed.c
index 2bd29c92ae..5a1d92b43c 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -1031,18 +1031,6 @@ static int ECDSA_verify_loop(void *args)
 /* ******************************************************************** */
 static long ecdh_c[EC_NUM][1];
 
-static int ECDH_EVP_derive_key(unsigned char *derived_secret,
-                               size_t *outlen, EVP_PKEY_CTX *ctx)
-{
-    int rt = 1;
-    if ((rt = EVP_PKEY_derive(ctx, derived_secret, outlen)) <= 0) {
-        BIO_printf(bio_err, "ECDH EVP_PKEY_derive failure: returned %d\n", rt);
-        ERR_print_errors(bio_err);
-        return rt;
-    }
-    return rt;
-}
-
 static int ECDH_EVP_derive_key_loop(void *args)
 {
     loopargs_t *tempargs = *(loopargs_t **) args;
@@ -1051,10 +1039,12 @@ static int ECDH_EVP_derive_key_loop(void *args)
     int count;
     size_t *outlen = &(tempargs->outlen[testnum]);
 
-    for (count = 0; COND(ecdh_c[testnum][0]); count++) {
-        if (!ECDH_EVP_derive_key(derived_secret, outlen, ctx))
+    for (count = 0; COND(ecdh_c[testnum][0]); count++)
+        if (EVP_PKEY_derive(ctx, derived_secret, outlen) <= 0) {
+            BIO_printf(bio_err, "ECDH EVP_PKEY_derive failure\n");
+            ERR_print_errors(bio_err);
             break;
-    }
+        }
     return count;
 }