root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

apps/speed.c: fix the wrong checks 

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19678)
This commit is contained in:
Peiwei Hu 2022-11-15 11:25:38 +08:00 committed by Tomas Mraz
parent 1a298b0011
commit 9dd009dd51
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/speed.c
View File

@ -2675,11 +2675,11 @@ skip_hmac:
* code, for maximum performance. * code, for maximum performance.
*/ */
if ((test_ctx = EVP_PKEY_CTX_new(key_B, NULL)) == NULL /* test ctx from skeyB */ if ((test_ctx = EVP_PKEY_CTX_new(key_B, NULL)) == NULL /* test ctx from skeyB */
|| !EVP_PKEY_derive_init(test_ctx) /* init derivation test_ctx */ || EVP_PKEY_derive_init(test_ctx) <= 0 /* init derivation test_ctx */
|| !EVP_PKEY_derive_set_peer(test_ctx, key_A) /* set peer pubkey in test_ctx */ || EVP_PKEY_derive_set_peer(test_ctx, key_A) <= 0 /* set peer pubkey in test_ctx */
|| !EVP_PKEY_derive(test_ctx, NULL, &test_outlen) /* determine max length */ || EVP_PKEY_derive(test_ctx, NULL, &test_outlen) <= 0 /* determine max length */
|| !EVP_PKEY_derive(ctx, loopargs[i].secret_a, &outlen) /* compute a*B */ || EVP_PKEY_derive(ctx, loopargs[i].secret_a, &outlen) <= 0 /* compute a*B */
|| !EVP_PKEY_derive(test_ctx, loopargs[i].secret_b, &test_outlen) /* compute b*A */ || EVP_PKEY_derive(test_ctx, loopargs[i].secret_b, &test_outlen) <= 0 /* compute b*A */
|| test_outlen != outlen /* compare output length */) { || test_outlen != outlen /* compare output length */) {
ecdh_checks = 0; ecdh_checks = 0;
BIO_printf(bio_err, "ECDH computation failure.\n"); BIO_printf(bio_err, "ECDH computation failure.\n");
@ -3110,10 +3110,10 @@ skip_hmac:
ffdh_checks = 0; ffdh_checks = 0;
break; break;
} }
if (!EVP_PKEY_derive_init(test_ctx) || if (EVP_PKEY_derive_init(test_ctx) <= 0 ||
!EVP_PKEY_derive_set_peer(test_ctx, pkey_A) || EVP_PKEY_derive_set_peer(test_ctx, pkey_A) <= 0 ||
!EVP_PKEY_derive(test_ctx, NULL, &test_out) || EVP_PKEY_derive(test_ctx, NULL, &test_out) <= 0 ||
!EVP_PKEY_derive(test_ctx, loopargs[i].secret_ff_b, &test_out) || EVP_PKEY_derive(test_ctx, loopargs[i].secret_ff_b, &test_out) <= 0 ||
test_out != secret_size) { test_out != secret_size) {
BIO_printf(bio_err, "FFDH computation failure.\n"); BIO_printf(bio_err, "FFDH computation failure.\n");
op_count = 1; op_count = 1;