1 files changed, 60 insertions, 20 deletions

diff --git a/src/regress/lib/libcrypto/mlkem/mlkem_tests_util.h b/src/regress/lib/libcrypto/mlkem/mlkem_tests_util.h
index cbb0f83f8c..7fbe6f76a9 100644
--- a/src/regress/lib/libcrypto/mlkem/mlkem_tests_util.h
+++ b/src/regress/lib/libcrypto/mlkem/mlkem_tests_util.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: mlkem_tests_util.h,v 1.3 2024/12/20 00:07:12 tb Exp $ */
+/*      $OpenBSD: mlkem_tests_util.h,v 1.4 2024/12/26 00:04:24 tb Exp $ */
 /*
  * Copyright (c) 2024 Bob Beck <beck@obtuse.com>
  * Copyright (c) 2024 Theo Buehler <tb@openbsd.org>
@@ -24,26 +24,66 @@
 
 #include "bytestring.h"
 
-struct MLKEM1024_private_key;
-struct MLKEM1024_public_key;
-struct MLKEM768_private_key;
-struct MLKEM768_public_key;
+#include "mlkem.h"
+#include "mlkem_internal.h"
 
-/* XXX - return values of the two compare functions are inconsistent */
 int compare_data(const uint8_t *want, const uint8_t *got, size_t len,
-    size_t line, const char *msg);
-int compare_length(size_t want, size_t got, size_t line, const char *msg);
-
-void hex_decode_cbs(CBS *cbs, CBB *cbb, size_t line, const char *msg);
-int get_string_cbs(CBS *cbs, const char *str, size_t line, const char *msg);
-
-int mlkem768_encode_private_key(const struct MLKEM768_private_key *priv,
-    uint8_t **out_buf, size_t *out_len);
-int mlkem768_encode_public_key(const struct MLKEM768_public_key *pub,
-    uint8_t **out_buf, size_t *out_len);
-int mlkem1024_encode_private_key(const struct MLKEM1024_private_key *priv,
-    uint8_t **out_buf, size_t *out_len);
-int mlkem1024_encode_public_key(const struct MLKEM1024_public_key *pub,
-    uint8_t **out_buf, size_t *out_len);
+    const char *msg);
+
+int mlkem768_encode_private_key(const void *priv, uint8_t **out_buf,
+    size_t *out_len);
+int mlkem768_encode_public_key(const void *pub, uint8_t **out_buf,
+    size_t *out_len);
+int mlkem1024_encode_private_key(const void *priv, uint8_t **out_buf,
+    size_t *out_len);
+int mlkem1024_encode_public_key(const void *pub, uint8_t **out_buf,
+    size_t *out_len);
+
+int mlkem768_decap(uint8_t out_shared_secret[MLKEM_SHARED_SECRET_BYTES],
+    const uint8_t *ciphertext, size_t ciphertext_len, const void *priv);
+void mlkem768_encap(uint8_t *out_ciphertext,
+    uint8_t out_shared_secret[MLKEM_SHARED_SECRET_BYTES], const void *pub);
+void mlkem768_encap_external_entropy(uint8_t *out_ciphertext,
+    uint8_t out_shared_secret[MLKEM_SHARED_SECRET_BYTES], const void *pub,
+    const uint8_t entropy[MLKEM_ENCAP_ENTROPY]);
+void mlkem768_generate_key(uint8_t *out_encoded_public_key,
+    uint8_t optional_out_seed[MLKEM_SEED_BYTES], void *out_private_key);
+void mlkem768_generate_key_external_entropy(uint8_t *out_encoded_public_key,
+    void *out_private_key, const uint8_t entropy[MLKEM_SEED_BYTES]);
+int mlkem768_parse_private_key(void *priv, CBS *private_key_cbs);
+int mlkem768_parse_public_key(void *pub, CBS *in);
+void mlkem768_public_from_private(void *out_public_key, const void *private_key);
+
+int mlkem1024_decap(uint8_t out_shared_secret[MLKEM_SHARED_SECRET_BYTES],
+    const uint8_t *ciphertext, size_t ciphertext_len, const void *priv);
+void mlkem1024_encap(uint8_t *out_ciphertext,
+    uint8_t out_shared_secret[MLKEM_SHARED_SECRET_BYTES], const void *pub);
+void mlkem1024_encap_external_entropy(uint8_t *out_ciphertext,
+    uint8_t out_shared_secret[MLKEM_SHARED_SECRET_BYTES], const void *pub,
+    const uint8_t entropy[MLKEM_ENCAP_ENTROPY]);
+void mlkem1024_generate_key(uint8_t *out_encoded_public_key,
+    uint8_t optional_out_seed[MLKEM_SEED_BYTES], void *out_private_key);
+void mlkem1024_generate_key_external_entropy(uint8_t *out_encoded_public_key,
+    void *out_private_key, const uint8_t entropy[MLKEM_SEED_BYTES]);
+int mlkem1024_parse_private_key(void *priv, CBS *private_key_cbs);
+int mlkem1024_parse_public_key(void *pub, CBS *in);
+void mlkem1024_public_from_private(void *out_public_key, const void *private_key);
+
+typedef int (*mlkem_encode_private_key_fn)(const void *, uint8_t **, size_t *);
+typedef int (*mlkem_encode_public_key_fn)(const void *, uint8_t **, size_t *);
+typedef int (*mlkem_decap_fn)(uint8_t [MLKEM_SHARED_SECRET_BYTES],
+    const uint8_t *, size_t, const void *);
+typedef void (*mlkem_encap_fn)(uint8_t *, uint8_t [MLKEM_SHARED_SECRET_BYTES],
+    const void *);
+typedef void (*mlkem_encap_external_entropy_fn)(uint8_t *,
+    uint8_t [MLKEM_SHARED_SECRET_BYTES], const void *,
+    const uint8_t [MLKEM_ENCAP_ENTROPY]);
+typedef void (*mlkem_generate_key_fn)(uint8_t *, uint8_t *, void *);
+typedef void (*mlkem_generate_key_external_entropy_fn)(uint8_t *, void *,
+    const uint8_t [MLKEM_SEED_BYTES]);
+typedef int (*mlkem_parse_private_key_fn)(void *, CBS *);
+typedef int (*mlkem_parse_public_key_fn)(void *, CBS *);
+typedef void (*mlkem_public_from_private_fn)(void *out_public_key,
+    const void *private_key);
 
 #endif /* MLKEM_TEST_UTIL_H */