feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #6723 from anhu/bench_sphincs_gating

Browse Source 
More gating on HAVE_SPHINCS in benchmarks
This commit is contained in:
JacobBarthelmeh
2023-08-23 14:10:51 -06:00
committed by GitHub
parent 827287000c 1608cb8b45
commit 32a07a7f5a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wolfcrypt/benchmark/benchmark.c
View File

@ -915,7 +915,7 @@ static const bench_pq_alg bench_pq_asym_opt[] = {
{ NULL, 0, NULL } { NULL, 0, NULL }
}; };
#ifdef HAVE_LIBOQS #if defined(HAVE_LIBOQS) && defined(HAVE_SPHINCS)
/* All recognized post-quantum asymmetric algorithm choosing command line /* All recognized post-quantum asymmetric algorithm choosing command line
* options. (Part 2) */ * options. (Part 2) */
static const bench_pq_alg bench_pq_asym_opt2[] = { static const bench_pq_alg bench_pq_asym_opt2[] = {
@ -934,7 +934,7 @@ static const bench_pq_alg bench_pq_asym_opt2[] = {
OQS_SIG_alg_sphincs_shake_256s_simple }, OQS_SIG_alg_sphincs_shake_256s_simple },
{ NULL, 0, NULL } { NULL, 0, NULL }
}; };
#endif /* HAVE_LIBOQS */ #endif /* HAVE_LIBOQS && HAVE_SPHINCS */
#endif /* HAVE_PQC */ #endif /* HAVE_PQC */
#ifdef HAVE_WNR #ifdef HAVE_WNR
@ -10357,10 +10357,10 @@ static void Usage(void)
#if defined(HAVE_PQC) && defined(HAVE_LIBOQS) #if defined(HAVE_PQC) && defined(HAVE_LIBOQS)
for (i=0; bench_pq_asym_opt[i].str != NULL; i++) for (i=0; bench_pq_asym_opt[i].str != NULL; i++)
print_alg(bench_pq_asym_opt[i].str, &line); print_alg(bench_pq_asym_opt[i].str, &line);
#if defined(HAVE_LIBOQS) #if defined(HAVE_LIBOQS) && defined(HAVE_SPHINCS)
for (i=0; bench_pq_asym_opt2[i].str != NULL; i++) for (i=0; bench_pq_asym_opt2[i].str != NULL; i++)
print_alg(bench_pq_asym_opt2[i].str, &line); print_alg(bench_pq_asym_opt2[i].str, &line);
#endif /* HAVE_LIBOQS */ #endif /* HAVE_LIBOQS && HAVE_SPHINCS */
#endif /* HAVE_PQC */ #endif /* HAVE_PQC */
#if defined(WOLFSSL_HAVE_LMS) #if defined(WOLFSSL_HAVE_LMS)
for (i=0; bench_pq_hash_sig_opt[i].str != NULL; i++) for (i=0; bench_pq_hash_sig_opt[i].str != NULL; i++)
@ -10601,6 +10601,7 @@ int wolfcrypt_benchmark_main(int argc, char** argv)
optMatched = 1; optMatched = 1;
} }
} }
#ifdef HAVE_SPHINCS
/* Both bench_pq_asym_opt and bench_pq_asym_opt2 are looking for /* Both bench_pq_asym_opt and bench_pq_asym_opt2 are looking for
* -pq, so we need to do a special case for -pq since optMatched * -pq, so we need to do a special case for -pq since optMatched
* was set to 1 just above. */ * was set to 1 just above. */
@ -10616,6 +10617,7 @@ int wolfcrypt_benchmark_main(int argc, char** argv)
optMatched = 1; optMatched = 1;
} }
} }
#endif
#endif /* HAVE_PQC */ #endif /* HAVE_PQC */
/* Other known cryptographic algorithms */ /* Other known cryptographic algorithms */
for (i=0; !optMatched && bench_other_opt[i].str != NULL; i++) { for (i=0; !optMatched && bench_other_opt[i].str != NULL; i++) {