Merge pull request #8755 from AlexLanzano/pqc-gcc-error

Remove redefinition of MlKemKey and Fix build issue in benchmark
This commit is contained in:
David Garske
2025-05-15 11:00:40 -07:00
committed by GitHub
2 changed files with 3 additions and 3 deletions

View File

@ -1124,6 +1124,7 @@ static const bench_pq_hash_sig_alg bench_pq_hash_sig_opt[] = {
}; };
#endif /* BENCH_PQ_STATEFUL_HBS */ #endif /* BENCH_PQ_STATEFUL_HBS */
#ifndef WOLFSSL_BENCHMARK_ALL
#if defined(WOLFSSL_HAVE_MLKEM) || defined(HAVE_FALCON) || \ #if defined(WOLFSSL_HAVE_MLKEM) || defined(HAVE_FALCON) || \
defined(HAVE_DILITHIUM) || defined(HAVE_SPHINCS) defined(HAVE_DILITHIUM) || defined(HAVE_SPHINCS)
/* The post-quantum-specific mapping of command line option to bit values and /* The post-quantum-specific mapping of command line option to bit values and
@ -1181,6 +1182,8 @@ static const bench_pq_alg bench_pq_asym_opt2[] = {
#endif /* HAVE_SPHINCS */ #endif /* HAVE_SPHINCS */
#endif #endif
#endif
#ifdef HAVE_WNR #ifdef HAVE_WNR
const char* wnrConfigFile = "wnr-example.conf"; const char* wnrConfigFile = "wnr-example.conf";
#endif #endif

View File

@ -146,9 +146,6 @@ struct MlKemKey {
extern "C" { extern "C" {
#endif #endif
/* For backward compatibility */
typedef struct MlKemKey KyberKey;
WOLFSSL_LOCAL WOLFSSL_LOCAL
void mlkem_init(void); void mlkem_init(void);