From ac440f413f2294189183cb53aec11d4c0aeb9431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Guti=C3=A9rrez?= Date: Fri, 21 Feb 2025 13:51:33 +0100 Subject: [PATCH] Added alg_version details as test output MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Pablo Gutiérrez --- tests/test_kem.c | 61 +------------------------------------------ tests/test_kem_mem.c | 3 +++ tests/test_sig.c | 1 + tests/test_sig_mem.c | 3 +++ tests/test_sig_stfl.c | 1 + 5 files changed, 9 insertions(+), 60 deletions(-) diff --git a/tests/test_kem.c b/tests/test_kem.c index b72aaa53d5..e5a317c833 100644 --- a/tests/test_kem.c +++ b/tests/test_kem.c @@ -149,68 +149,9 @@ static OQS_STATUS kem_test_correctness(const char *method_name) { goto err; } - // Check KEM implementation - const char *implementation = NULL; - -#if defined(OQS_ENABLE_LIBJADE_KEM_kyber_512_avx2) - if (strcasecmp(method_name, OQS_KEM_alg_kyber_512) == 0) { - implementation = "src/kem/kyber/libjade_kyber512_avx2"; - } -#elif defined(OQS_ENABLE_LIBJADE_KEM_kyber_512) - if (strcasecmp(method_name, OQS_KEM_alg_kyber_512) == 0) { - implementation = "src/kem/kyber/libjade_kyber512_ref"; - } -#elif defined(OQS_ENABLE_KEM_kyber_512_avx2) - if (strcasecmp(method_name, OQS_KEM_alg_kyber_512) == 0) { - implementation = "src/kem/kyber/pqcrystals-kyber_kyber512_avx2"; - } -#elif defined(OQS_ENABLE_KEM_kyber_512_aarch64) - if (strcasecmp(method_name, OQS_KEM_alg_kyber_512) == 0) { - implementation = "src/kem/kyber/oldpqclean_kyber512_aarch64"; - } -#endif - -#if defined(OQS_ENABLE_LIBJADE_KEM_kyber_768_avx2) - if (strcasecmp(method_name, OQS_KEM_alg_kyber_768) == 0) { - implementation = "src/kem/kyber/libjade_kyber768_avx2"; - } -#elif defined(OQS_ENABLE_LIBJADE_KEM_kyber_768) - if (strcasecmp(method_name, OQS_KEM_alg_kyber_768) == 0) { - implementation = "src/kem/kyber/libjade_kyber768_ref"; - } -#elif defined(OQS_ENABLE_KEM_kyber_768_avx2) - if (strcasecmp(method_name, OQS_KEM_alg_kyber_768) == 0) { - implementation = "src/kem/kyber/pqcrystals-kyber_kyber768_avx2"; - } -#elif defined(OQS_ENABLE_KEM_kyber_768) - if (strcasecmp(method_name, OQS_KEM_alg_kyber_768) == 0) { - implementation = "src/kem/kyber/pqcrystals-kyber_kyber768_ref"; - } -#elif defined(OQS_ENABLE_KEM_kyber_768_aarch64) - if (strcasecmp(method_name, OQS_KEM_alg_kyber_768) == 0) { - implementation = "src/kem/kyber/oldpqclean_kyber768_aarch64"; - } -#endif - -#if defined(OQS_ENABLE_KEM_kyber_1024_avx2) - if (strcasecmp(method_name, OQS_KEM_alg_kyber_1024) == 0) { - implementation = "src/kem/kyber/pqcrystals-kyber_kyber1024_avx2"; - } -#elif defined(OQS_ENABLE_KEM_kyber_1024_aarch64) - if (strcasecmp(method_name, OQS_KEM_alg_kyber_1024) == 0) { - implementation = "src/kem/kyber/oldpqclean_kyber1024_aarch64"; - } -#elif defined(OQS_ENABLE_KEM_kyber_1024) - if (strcasecmp(method_name, OQS_KEM_alg_kyber_1024) == 0) { - implementation = "src/kem/kyber/pqcrystals-kyber_kyber1024_ref"; - } -#else - implementation = "Unknown"; -#endif - printf("================================================================================\n"); printf("Sample computation for KEM %s\n", kem->method_name); - printf("Implementation source: %s\n", implementation); + printf("Version source: %s\n", kem->alg_version); printf("================================================================================\n"); public_key = OQS_MEM_malloc(kem->length_public_key + 2 * sizeof(magic_t)); diff --git a/tests/test_kem_mem.c b/tests/test_kem_mem.c index 4c2cbd92d7..f4548eb09b 100644 --- a/tests/test_kem_mem.c +++ b/tests/test_kem_mem.c @@ -51,6 +51,7 @@ static OQS_STATUS kem_test_correctness(const char *method_name, KEM_OPS op) { case KEM_KEYGEN: printf("================================================================================\n"); printf("Executing keygen for KEM %s\n", kem->method_name); + printf("Version source: %s\n", kem->alg_version); printf("================================================================================\n"); public_key = OQS_MEM_malloc(kem->length_public_key); @@ -78,6 +79,7 @@ static OQS_STATUS kem_test_correctness(const char *method_name, KEM_OPS op) { case KEM_ENCAPS: printf("================================================================================\n"); printf("Executing encaps for KEM %s\n", kem->method_name); + printf("Version source: %s\n", kem->alg_version); printf("================================================================================\n"); public_key = OQS_MEM_malloc(kem->length_public_key); @@ -113,6 +115,7 @@ static OQS_STATUS kem_test_correctness(const char *method_name, KEM_OPS op) { case KEM_DECAPS: printf("================================================================================\n"); printf("Executing decaps for KEM %s\n", kem->method_name); + printf("Version source: %s\n", kem->alg_version); printf("================================================================================\n"); public_key = OQS_MEM_malloc(kem->length_public_key); diff --git a/tests/test_sig.c b/tests/test_sig.c index 6ceb2363c6..cc3e83c5c3 100644 --- a/tests/test_sig.c +++ b/tests/test_sig.c @@ -54,6 +54,7 @@ static OQS_STATUS sig_test_correctness(const char *method_name) { printf("================================================================================\n"); printf("Sample computation for signature %s\n", sig->method_name); + printf("Version source: %s\n", sig->alg_version); printf("================================================================================\n"); public_key = OQS_MEM_malloc(sig->length_public_key + 2 * sizeof(magic_t)); diff --git a/tests/test_sig_mem.c b/tests/test_sig_mem.c index bda9bbfc5c..6445a2e333 100644 --- a/tests/test_sig_mem.c +++ b/tests/test_sig_mem.c @@ -40,6 +40,7 @@ static OQS_STATUS sig_test_correctness(const char *method_name, SIG_OPS op) { case SIG_KEYGEN: printf("================================================================================\n"); printf("Executing keygen for SIGALG %s\n", sig->method_name); + printf("Version source: %s\n", sig->alg_version); printf("================================================================================\n"); public_key = OQS_MEM_malloc(sig->length_public_key); @@ -65,6 +66,7 @@ static OQS_STATUS sig_test_correctness(const char *method_name, SIG_OPS op) { case SIG_SIGN: printf("================================================================================\n"); printf("Executing sign for SIGALG %s\n", sig->method_name); + printf("Version source: %s\n", sig->alg_version); printf("================================================================================\n"); public_key = OQS_MEM_malloc(sig->length_public_key); @@ -102,6 +104,7 @@ static OQS_STATUS sig_test_correctness(const char *method_name, SIG_OPS op) { case SIG_VERIFY: printf("================================================================================\n"); printf("Executing verify for SIGALG %s\n", sig->method_name); + printf("Version source: %s\n", sig->alg_version); printf("================================================================================\n"); public_key = OQS_MEM_malloc(sig->length_public_key); diff --git a/tests/test_sig_stfl.c b/tests/test_sig_stfl.c index 687cc9609d..79d303b39a 100644 --- a/tests/test_sig_stfl.c +++ b/tests/test_sig_stfl.c @@ -441,6 +441,7 @@ static OQS_STATUS sig_stfl_test_correctness(const char *method_name, const char printf("================================================================================\n"); printf("Sample computation for stateful signature %s\n", sig->method_name); + printf("Version source: %s\n", sig->alg_version); printf("================================================================================\n"); secret_key = OQS_SIG_STFL_SECRET_KEY_new(sig->method_name);