WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix falcon bench cleanup case (should not free if init fails). Fix RSA key gen keySz with `./wolfcrypt/benchmark/benchmark -asym`.

pull/4558/head
David Garske 2021-11-10 15:03:44 -08:00
parent f2465e5688
commit 3c1deff611
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
wolfcrypt/benchmark/benchmark.c
View File

@ -1825,11 +1825,12 @@ static void* benchmarks_do(void* args)
#ifdef WOLFSSL_KEY_GEN #ifdef WOLFSSL_KEY_GEN
if (bench_all || (bench_asym_algs & BENCH_RSA_KEYGEN)) { if (bench_all || (bench_asym_algs & BENCH_RSA_KEYGEN)) {
#ifndef NO_SW_BENCH #ifndef NO_SW_BENCH
if (bench_asym_algs & BENCH_RSA_SZ) { if (((word32)bench_asym_algs == 0xFFFFFFFFU) ||
bench_rsaKeyGen_size(0, bench_size); (bench_asym_algs & BENCH_RSA_SZ) == 0) {
bench_rsaKeyGen(0);
} }
else { else {
bench_rsaKeyGen(0); bench_rsaKeyGen_size(0, bench_size);
} }
#endif #endif
#if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_RSA_KEYGEN) \ #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_RSA_KEYGEN) \
@ -6432,18 +6433,15 @@ void bench_falconKeySign(byte level)
word32 x = 0; word32 x = 0;
const char**desc = bench_desc_words[lng_index]; const char**desc = bench_desc_words[lng_index];
if (ret == 0) {
ret = wc_falcon_init(&key); ret = wc_falcon_init(&key);
if (ret != 0) { if (ret != 0) {
printf("wc_falcon_init failed\n"); printf("wc_falcon_init failed %d\n", ret);
} return;
} }
if (ret == 0) {
ret = wc_falcon_set_level(&key, level); ret = wc_falcon_set_level(&key, level);
if (ret != 0) { if (ret != 0) {
printf("wc_falcon_set_level failed\n"); printf("wc_falcon_set_level failed %d\n", ret);
}
} }
if (ret == 0) { if (ret == 0) {
@ -6459,7 +6457,7 @@ void bench_falconKeySign(byte level)
} }
if (ret != 0) { if (ret != 0) {
printf("wc_falcon_import_private_key failed\n"); printf("wc_falcon_import_private_key failed %d\n", ret);
} }
} }
@ -6507,7 +6505,8 @@ void bench_falconKeySign(byte level)
} }
if (ret != 0 || verify != 1) { if (ret != 0 || verify != 1) {
printf("wc_falcon_verify_msg failed\n"); printf("wc_falcon_verify_msg failed %d, verify %d\n",
ret, verify);
ret = -1; ret = -1;
} }
} }