wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove ECDH_EVP_derive_key wrapper function

Browse source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1658)
This commit is contained in:
Nicola Tuveri 2016-10-04 15:56:49 +03:00 committed by Rich Salz
parent 2e4c3b5caa
commit db1dd9368a
1 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
apps/speed.c
View file

@ -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;
}