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, 210 deletions

diff --git a/src/regress/lib/libcrypto/mlkem/mlkem768_encap_tests.c b/src/regress/lib/libcrypto/mlkem/mlkem768_encap_tests.c
deleted file mode 100644
index e2123f8de5..0000000000
--- a/src/regress/lib/libcrypto/mlkem/mlkem768_encap_tests.c
+++ /dev/null
@@ -1,210 +0,0 @@
-/*      $OpenBSD: mlkem768_encap_tests.c,v 1.4 2024/12/20 00:32:15 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 <assert.h>
-#include <err.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "bytestring.h"
-#include "mlkem.h"
-
-#include "mlkem_internal.h"
-#include "mlkem_tests_util.h"
-
-static int
-MlkemEncapFileTest(CBB *entropy_cbb, CBB *pubkey_cbb, CBB *ciphertext_cbb,
-    CBB *shared_secret_cbb, int should_fail, size_t line)
-{
-        struct MLKEM768_public_key pub;
-        uint8_t *entropy = NULL, *public_key = NULL, *ciphertext = NULL;
-        uint8_t *shared_secret = NULL;
-        size_t entropy_len = 0, public_key_len = 0, ciphertext_len = 0;
-        size_t shared_secret_len = 0;
-        uint8_t shared_secret_buf[MLKEM_SHARED_SECRET_BYTES];
-        uint8_t ciphertext_buf[MLKEM768_CIPHERTEXT_BYTES];
-        CBS public_key_cbs;
-        int failed = 1;
-
-        if (!CBB_finish(entropy_cbb, &entropy, &entropy_len))
-                goto err;
-        if (!CBB_finish(pubkey_cbb, &public_key, &public_key_len))
-                goto err;
-        if (!CBB_finish(ciphertext_cbb, &ciphertext, &ciphertext_len))
-                goto err;
-        if (!CBB_finish(shared_secret_cbb, &shared_secret, &shared_secret_len))
-                goto err;
-
-        CBS_init(&public_key_cbs, public_key, public_key_len);
-
-        if (!MLKEM768_parse_public_key(&pub, &public_key_cbs)) {
-                if ((failed = !should_fail))
-                        warnx("#%zu: parse_public_key", line);
-                goto err;
-        }
-        MLKEM768_encap_external_entropy(ciphertext_buf, shared_secret_buf,
-            &pub, entropy);
-
-        failed = compare_data(shared_secret, shared_secret_buf,
-            MLKEM_SHARED_SECRET_BYTES, line, "shared_secret");
-        failed |= compare_data(ciphertext, ciphertext_buf,
-            MLKEM768_CIPHERTEXT_BYTES, line, "ciphertext");
-
-        if (should_fail != failed) {
-                warnx("FAIL: #%zu: should_fail %d, failed %d",
-                    line, should_fail, failed);
-                failed = 1;
-        }
-
- err:
-        CBB_cleanup(entropy_cbb);
-        CBB_cleanup(pubkey_cbb);
-        CBB_cleanup(ciphertext_cbb);
-        CBB_cleanup(shared_secret_cbb);
-        freezero(entropy, entropy_len);
-        freezero(public_key, public_key_len);
-        freezero(ciphertext, ciphertext_len);
-        freezero(shared_secret, shared_secret_len);
-
-        return failed;
-}
-
-#define S_START                 0
-#define S_COMMENT               1
-#define S_ENTROPY               2
-#define S_PUBLIC_KEY            3
-#define S_RESULT                4
-#define S_CIPHERTEXT            5
-#define S_SHARED_SECRET         6
-
-#define S2S(x) case x: return #x
-
-static const char *
-state2str(int state)
-{
-        switch (state) {
-        S2S(S_START);
-        S2S(S_COMMENT);
-        S2S(S_ENTROPY);
-        S2S(S_PUBLIC_KEY);
-        S2S(S_RESULT);
-        S2S(S_CIPHERTEXT);
-        S2S(S_SHARED_SECRET);
-        default:
-                errx(1, "unknown state %d", state);
-        }
-}
-
-int
-main(int argc, char **argv)
-{
-        CBB entropy = { 0 }, public_key = { 0 }, ciphertext = { 0 }, shared_secret = { 0 };
-        int should_fail = 0;
-        const char *test;
-        size_t line;
-        char *buf = NULL;
-        size_t buflen = 0;
-        ssize_t len;
-        FILE *fp;
-        int state;
-        int failed = 0;
-
-        if (argc < 2)
-                errx(1, "%s: missing test file", argv[0]);
-
-        test = argv[1];
-        line = 0;
-
-        if ((fp = fopen(test, "r")) == NULL)
-                err(1, "can't open test file");
-
-        state = S_COMMENT;
-        line = 0;
-
-        while ((len = getline(&buf, &buflen, fp)) != -1) {
-                const char *msg = state2str(state);
-                CBS cbs;
-                uint8_t u8;
-
-                line++;
-                CBS_init(&cbs, buf, len);
-
-                if (!CBS_get_last_u8(&cbs, &u8))
-                        errx(1, "#%zu %s: CBB_get_last_u8", line, msg);
-                assert(u8 == '\n');
-
-                switch (state) {
-                case S_START:
-                        state = S_COMMENT;
-                        break;
-                case S_COMMENT:
-                        if (!CBS_get_u8(&cbs, &u8))
-                                errx(1, "#%zu %s: CBB_get_u8", line, msg);
-                        assert(u8 == '#');
-                        if (!CBS_skip(&cbs, CBS_len(&cbs)))
-                                errx(1, "#%zu %s: CBB_skip", line, msg);
-                        state = S_ENTROPY;
-                        break;
-                case S_ENTROPY:
-                        if (!get_string_cbs(&cbs, "entropy: ", line, msg))
-                                errx(1, "#%zu %s: get_string_cbs", line, msg);
-                        hex_decode_cbs(&cbs, &entropy, line, msg);
-                        state = S_PUBLIC_KEY;
-                        break;
-                case S_PUBLIC_KEY:
-                        if (!get_string_cbs(&cbs, "public_key = ", line, msg))
-                                errx(1, "#%zu %s: get_string_cbs", line, msg);
-                        hex_decode_cbs(&cbs, &public_key, line, msg);
-                        state = S_RESULT;
-                        break;
-                case S_RESULT:
-                        if (!get_string_cbs(&cbs, "result: ", line, msg))
-                                errx(1, "#%zu %s: get_string_cbs", line, msg);
-                        should_fail = get_string_cbs(&cbs, "fail", line, msg);
-                        state = S_CIPHERTEXT;
-                        break;
-                case S_CIPHERTEXT:
-                        if (!get_string_cbs(&cbs, "ciphertext: ", line, msg))
-                                errx(1, "#%zu %s: get_string_cbs", line, msg);
-                        hex_decode_cbs(&cbs, &ciphertext, line, msg);
-                        state = S_SHARED_SECRET;
-                        break;
-                case S_SHARED_SECRET:
-                        if (!get_string_cbs(&cbs, "shared_secret: ", line, msg))
-                                errx(1, "#%zu %s: get_string_cbs", line, msg);
-                        hex_decode_cbs(&cbs, &shared_secret, line, msg);
-
-                        failed |= MlkemEncapFileTest(&entropy, &public_key,
-                            &ciphertext, &shared_secret, should_fail, line);
-
-                        state = S_START;
-                        break;
-                }
-                if (CBS_len(&cbs) > 0)
-                        errx(1, "#%zu %s: CBS_len", line, msg);
-        }
-        free(buf);
-
-        if (ferror(fp))
-                err(1, NULL);
-        fclose(fp);
-
-        return failed;
-}