Overhaul ML-KEM regress once more

Implement a file parser that drives a state machine to extract the test data
from the .txt files and manages the parsed data. Comments and empty lines are
ignored. The code currently assumes that instruction lines are at the start
of the file (which isn't generally true) and only supports two line types for
now. This is good enough for all the ML-KEM tests but should be easy enough
to extend.

Once all data for a test case is parsed in the expected order, a test handler
is called which can retrieve the test data via a simple API and throw warnings
and errors with information on the test case line number, etc.

Merge the tests into three programs: one parsing the .txt files and running
the corresponding test cases, a unit test and the iteration tests. Deduplicate
the actual test code and let the caller pass in an object containing the
API functions, private keys and arrays that need to be different between the
768 version and the 1024 version. This way we don't have two sets of half a
dozen .c files differing only in 3 or 4 occurrences of 768 and 1024.

All this will also make it a lot easier to hook these tests into portable.

1 files changed, 0 insertions, 149 deletions

diff --git a/src/regress/lib/libcrypto/mlkem/mlkem768_iteration_test.c b/src/regress/lib/libcrypto/mlkem/mlkem768_iteration_test.c
deleted file mode 100644
index 9517980d7b..0000000000
--- a/src/regress/lib/libcrypto/mlkem/mlkem768_iteration_test.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/*      $OpenBSD: mlkem768_iteration_test.c,v 1.3 2024/12/20 00:07:12 tb Exp $ */
-/*
- * Copyright (c) 2024 Google Inc.
- * Copyright (c) 2024 Bob Beck <beck@obtuse.com>
- * Copyright (c) 2024 Theo Buehler <tb@openbsd.org>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <err.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "mlkem.h"
-
-#include "mlkem_internal.h"
-#include "mlkem_tests_util.h"
-#include "sha3_internal.h"
-
-/*
- * The structure of this test is taken from
- *  https://github.com/C2SP/CCTV/blob/main/ML-KEM/README.md?ref=words.filippo.io#accumulated-pq-crystals-vectors
- *  but the final value has been updated to reflect the change from Kyber to
- *  ML-KEM.
- *
- * The deterministic RNG is a single SHAKE-128 instance with an empty input.
- * (The RNG stream starts with 7f9c2ba4e88f827d616045507605853e.)
- */
-
-static int
-MlkemIterativeTest(void)
-{
-        /* https://github.com/C2SP/CCTV/tree/main/ML-KEM */
-        /*
-         * The deterministic RNG is a single SHAKE-128 instance with an empty input.
-         * (The RNG stream starts with 7f9c2ba4e88f827d616045507605853e.)
-         */
-        const uint8_t kExpectedSeedStart[16] = {
-                0x7f, 0x9c, 0x2b, 0xa4, 0xe8, 0x8f, 0x82, 0x7d, 0x61, 0x60, 0x45,
-                0x50, 0x76, 0x05, 0x85, 0x3e
-        };
-
-        /*
-         * Filippo says:
-         * ML-KEM-768: f7db260e1137a742e05fe0db9525012812b004d29040a5b606aad3d134b548d3
-         * but Boring believes this:
-         */
-        const uint8_t kExpectedAdam[32] = {
-                0xf9, 0x59, 0xd1, 0x8d, 0x3d, 0x11, 0x80, 0x12, 0x14, 0x33, 0xbf,
-                0x0e, 0x05, 0xf1, 0x1e, 0x79, 0x08, 0xcf, 0x9d, 0x03, 0xed, 0xc1,
-                0x50, 0xb2, 0xb0, 0x7c, 0xb9, 0x0b, 0xef, 0x5b, 0xc1, 0xc1
-        };
-        uint8_t encoded_public_key[MLKEM768_PUBLIC_KEY_BYTES];
-        uint8_t invalid_ciphertext[MLKEM768_CIPHERTEXT_BYTES];
-        uint8_t shared_secret[MLKEM_SHARED_SECRET_BYTES];
-        uint8_t ciphertext[MLKEM768_CIPHERTEXT_BYTES];
-        uint8_t encap_entropy[MLKEM_ENCAP_ENTROPY];
-        uint8_t seed[MLKEM_SEED_BYTES] = {0};
-        struct MLKEM768_private_key priv;
-        struct MLKEM768_public_key pub;
-        sha3_ctx drng, results;
-        uint8_t out[32];
-        int i;
-
-        shake128_init(&drng);
-        shake128_init(&results);
-
-        shake_xof(&drng);
-        for (i = 0; i < 10000; i++) {
-                uint8_t *encoded_private_key = NULL;
-                size_t encoded_private_key_len;
-
-                /*
-                 * This should draw both d and z from DRNG concatenating in
-                 * seed.
-                 */
-                shake_out(&drng, seed, sizeof(seed));
-                if (i == 0) {
-                        if (compare_data(seed, kExpectedSeedStart,
-                            sizeof(kExpectedSeedStart), 0, "seed start") != 0)
-                                errx(1, "compare_data");
-                }
-
-                /* generate ek as encoded_public_key */
-                MLKEM768_generate_key_external_entropy(encoded_public_key,
-                    &priv, seed);
-                MLKEM768_public_from_private(&pub, &priv);
-
-                /* hash in ek */
-                shake_update(&results, encoded_public_key,
-                    sizeof(encoded_public_key));
-
-                /* marshal priv to dk as encoded_private_key */
-                if (!mlkem768_encode_private_key(&priv, &encoded_private_key,
-                    &encoded_private_key_len))
-                        errx(1, "mlkem768_encode_private_key");
-
-                /* hash in dk */
-                shake_update(&results, encoded_private_key,
-                    encoded_private_key_len);
-
-                free(encoded_private_key);
-
-                /* draw m as encap entropy from DRNG */
-                shake_out(&drng, encap_entropy, sizeof(encap_entropy));
-
-                /* generate ct as ciphertext, k as shared_secret */
-                MLKEM768_encap_external_entropy(ciphertext, shared_secret,
-                    &pub, encap_entropy);
-
-                /* hash in ct */
-                shake_update(&results, ciphertext, sizeof(ciphertext));
-                /* hash in k */
-                shake_update(&results, shared_secret, sizeof(shared_secret));
-
-                /* draw ct as invalid_ciphertxt from DRNG */
-                shake_out(&drng, invalid_ciphertext,
-                    sizeof(invalid_ciphertext));
-
-                /* generte k as shared secret from invalid ciphertext */
-                if (!MLKEM768_decap(shared_secret, invalid_ciphertext,
-                    sizeof(invalid_ciphertext), &priv))
-                        errx(1, "decap failed");
-
-                /* hash in k */
-                shake_update(&results, shared_secret, sizeof(shared_secret));
-        }
-        shake_xof(&results);
-        shake_out(&results, out, sizeof(out));
-
-        return compare_data(kExpectedAdam, out, sizeof(out), i, "final result hash");
-}
-
-int
-main(int argc, char **argv)
-{
-        return MlkemIterativeTest();
-}