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

Remove redefinition of MlKemKey and Fix build issue in benchmark

wolfcrypt/benchmark/benchmark.c

@@ -1124,6 +1124,7 @@ static const bench_pq_hash_sig_alg bench_pq_hash_sig_opt[] = {
 };
 #endif /* BENCH_PQ_STATEFUL_HBS */
 
+#ifndef WOLFSSL_BENCHMARK_ALL
 #if defined(WOLFSSL_HAVE_MLKEM) || defined(HAVE_FALCON) || \
     defined(HAVE_DILITHIUM) || defined(HAVE_SPHINCS)
 /* 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
 
+#endif
+
 #ifdef HAVE_WNR
     const char* wnrConfigFile = "wnr-example.conf";
 #endif

wolfssl/wolfcrypt/wc_mlkem.h

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