From 10bebbca92ef87af97bc15c6337afbbe050bb96e Mon Sep 17 00:00:00 2001 From: tb <> Date: Thu, 1 Jan 2026 12:47:52 +0000 Subject: Rename RANK{768,1024} to MLKEM{768,1024}_RANK RANK768 and RANK1024 are awfully short and generic names for public constants. Before we make it worse with similarly named constants for ML-DSA, let's fix this. This follows the naming convention used by the other macros in the mlkem code. ok kenjiro jsing --- .../lib/libcrypto/mlkem/mlkem_iteration_tests.c | 10 +++++----- src/regress/lib/libcrypto/mlkem/mlkem_tests.c | 22 +++++++++++----------- src/regress/lib/libcrypto/mlkem/mlkem_unittest.c | 6 +++--- src/regress/lib/libcrypto/wycheproof/wycheproof.go | 6 +++--- 4 files changed, 22 insertions(+), 22 deletions(-) (limited to 'src/regress') diff --git a/src/regress/lib/libcrypto/mlkem/mlkem_iteration_tests.c b/src/regress/lib/libcrypto/mlkem/mlkem_iteration_tests.c index 053f8e1222..d6451fafb8 100644 --- a/src/regress/lib/libcrypto/mlkem/mlkem_iteration_tests.c +++ b/src/regress/lib/libcrypto/mlkem/mlkem_iteration_tests.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mlkem_iteration_tests.c,v 1.8 2025/08/17 19:26:35 tb Exp $ */ +/* $OpenBSD: mlkem_iteration_tests.c,v 1.9 2026/01/01 12:47:52 tb Exp $ */ /* * Copyright (c) 2024 Google Inc. * Copyright (c) 2024 Bob Beck @@ -78,10 +78,10 @@ MlkemIterativeTest(int rank) start = kExpectedSeedStart; start_len = sizeof(kExpectedSeedStart); switch(rank){ - case RANK768: + case MLKEM768_RANK: expected = kExpectedAdam768; break; - case RANK1024: + case MLKEM1024_RANK: expected = kExpectedAdam1024; break; default: @@ -196,8 +196,8 @@ main(void) { int failed = 0; - failed |= MlkemIterativeTest(RANK768); - failed |= MlkemIterativeTest(RANK1024); + failed |= MlkemIterativeTest(MLKEM768_RANK); + failed |= MlkemIterativeTest(MLKEM1024_RANK); return failed; } diff --git a/src/regress/lib/libcrypto/mlkem/mlkem_tests.c b/src/regress/lib/libcrypto/mlkem/mlkem_tests.c index 361467afd0..5e8441307c 100644 --- a/src/regress/lib/libcrypto/mlkem/mlkem_tests.c +++ b/src/regress/lib/libcrypto/mlkem/mlkem_tests.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mlkem_tests.c,v 1.10 2025/08/15 21:47:39 tb Exp $ */ +/* $OpenBSD: mlkem_tests.c,v 1.11 2026/01/01 12:47:52 tb Exp $ */ /* * Copyright (c) 2024 Google Inc. * Copyright (c) 2024 Theo Buehler @@ -686,27 +686,27 @@ static int run_mlkem_test(const char *test, const char *fn) { if (strcmp(test, "mlkem768_decap_tests") == 0) - return mlkem_decap_tests(fn, RANK768, TEST_TYPE_NORMAL); + return mlkem_decap_tests(fn, MLKEM768_RANK, TEST_TYPE_NORMAL); if (strcmp(test, "mlkem768_nist_decap_tests") == 0) - return mlkem_decap_tests(fn, RANK768, TEST_TYPE_NIST); + return mlkem_decap_tests(fn, MLKEM768_RANK, TEST_TYPE_NIST); if (strcmp(test, "mlkem1024_decap_tests") == 0) - return mlkem_decap_tests(fn, RANK1024, TEST_TYPE_NORMAL); + return mlkem_decap_tests(fn, MLKEM1024_RANK, TEST_TYPE_NORMAL); if (strcmp(test, "mlkem1024_nist_decap_tests") == 0) - return mlkem_decap_tests(fn, RANK1024, TEST_TYPE_NIST); + return mlkem_decap_tests(fn, MLKEM1024_RANK, TEST_TYPE_NIST); if (strcmp(test, "mlkem768_encap_tests") == 0) - return mlkem_encap_tests(fn, RANK768); + return mlkem_encap_tests(fn, MLKEM768_RANK); if (strcmp(test, "mlkem1024_encap_tests") == 0) - return mlkem_encap_tests(fn, RANK1024); + return mlkem_encap_tests(fn, MLKEM1024_RANK); if (strcmp(test, "mlkem768_keygen_tests") == 0) - return mlkem_keygen_tests(fn, RANK768, TEST_TYPE_NORMAL); + return mlkem_keygen_tests(fn, MLKEM768_RANK, TEST_TYPE_NORMAL); if (strcmp(test, "mlkem768_nist_keygen_tests") == 0) - return mlkem_keygen_tests(fn, RANK768, TEST_TYPE_NIST); + return mlkem_keygen_tests(fn, MLKEM768_RANK, TEST_TYPE_NIST); if (strcmp(test, "mlkem1024_keygen_tests") == 0) - return mlkem_keygen_tests(fn, RANK1024, TEST_TYPE_NORMAL); + return mlkem_keygen_tests(fn, MLKEM1024_RANK, TEST_TYPE_NORMAL); if (strcmp(test, "mlkem1024_nist_keygen_tests") == 0) - return mlkem_keygen_tests(fn, RANK1024, TEST_TYPE_NIST); + return mlkem_keygen_tests(fn, MLKEM1024_RANK, TEST_TYPE_NIST); errx(1, "unknown test %s (test file %s)", test, fn); } diff --git a/src/regress/lib/libcrypto/mlkem/mlkem_unittest.c b/src/regress/lib/libcrypto/mlkem/mlkem_unittest.c index f802324189..1d8149b523 100644 --- a/src/regress/lib/libcrypto/mlkem/mlkem_unittest.c +++ b/src/regress/lib/libcrypto/mlkem/mlkem_unittest.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mlkem_unittest.c,v 1.15 2025/08/17 19:26:35 tb Exp $ */ +/* $OpenBSD: mlkem_unittest.c,v 1.16 2026/01/01 12:47:52 tb Exp $ */ /* * Copyright (c) 2024 Google Inc. * Copyright (c) 2024 Bob Beck @@ -300,8 +300,8 @@ main(void) { int failed = 0; - failed |= MlKemUnitTest(RANK768); - failed |= MlKemUnitTest(RANK1024); + failed |= MlKemUnitTest(MLKEM768_RANK); + failed |= MlKemUnitTest(MLKEM1024_RANK); return failed; } diff --git a/src/regress/lib/libcrypto/wycheproof/wycheproof.go b/src/regress/lib/libcrypto/wycheproof/wycheproof.go index 907f58d5f8..397958ac15 100644 --- a/src/regress/lib/libcrypto/wycheproof/wycheproof.go +++ b/src/regress/lib/libcrypto/wycheproof/wycheproof.go @@ -1,4 +1,4 @@ -/* $OpenBSD: wycheproof.go,v 1.195 2025/12/27 03:23:57 tb Exp $ */ +/* $OpenBSD: wycheproof.go,v 1.196 2026/01/01 12:47:52 tb Exp $ */ /* * Copyright (c) 2018,2023 Joel Sing * Copyright (c) 2018,2019,2022-2025 Theo Buehler @@ -2460,9 +2460,9 @@ func (wtg *wycheproofTestGroupMLKEM) run(algorithm string, variant testVariant) fmt.Printf("INFO: skipping %v test group of type %v for %s\n", algorithm, wtg.Type, wtg.ParameterSet) return true case "ML-KEM-768": - rank = C.RANK768 + rank = C.MLKEM768_RANK case "ML-KEM-1024": - rank = C.RANK1024 + rank = C.MLKEM1024_RANK default: log.Fatalf("Unknown ML-KEM parameterSet %v", wtg.ParameterSet) } -- cgit v1.2.3-55-g6feb