Skip to content

Use mlkem_native.h from stack and acvp tests #1469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hanno-becker merged 1 commit into from
Jan 10, 2026
Merged

Use mlkem_native.h from stack and acvp tests #1469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions test/acvp/acvp_mlkem.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <string.h>
#include "../../mlkem/src/common.h"

#include "../../mlkem/src/kem.h"
#include "../../mlkem/mlkem_native.h"

#define USAGE \
"acvp_mlkem{lvl} [encapDecap|keyGen] [AFT|VAL] {test specific arguments}"
Expand Down Expand Up @@ -133,11 +133,11 @@ static void print_hex(const char *name, const unsigned char *raw, size_t len)
}

static void acvp_mlkem_encapDecp_AFT_encapsulation(
unsigned char const ek[MLKEM_INDCCA_PUBLICKEYBYTES],
unsigned char const ek[CRYPTO_PUBLICKEYBYTES],
unsigned char const m[MLKEM_SYMBYTES])
{
unsigned char ct[MLKEM_INDCCA_CIPHERTEXTBYTES];
unsigned char ss[MLKEM_SSBYTES];
unsigned char ct[CRYPTO_CIPHERTEXTBYTES];
unsigned char ss[CRYPTO_BYTES];

CHECK(crypto_kem_enc_derand(ct, ss, ek, m) == 0);

Expand All @@ -146,26 +146,26 @@ static void acvp_mlkem_encapDecp_AFT_encapsulation(
}

static void acvp_mlkem_encapDecp_VAL_decapsulation(
unsigned char const dk[MLKEM_INDCCA_SECRETKEYBYTES],
unsigned char const c[MLKEM_INDCCA_CIPHERTEXTBYTES])
unsigned char const dk[CRYPTO_SECRETKEYBYTES],
unsigned char const c[CRYPTO_CIPHERTEXTBYTES])
{
unsigned char ss[MLKEM_SSBYTES];
unsigned char ss[CRYPTO_BYTES];

CHECK(crypto_kem_dec(ss, c, dk) == 0);

print_hex("k", ss, sizeof(ss));
}

static void acvp_mlkem_encapDecp_VAL_encapsulationKeyCheck(
unsigned char const ek[MLKEM_INDCCA_PUBLICKEYBYTES])
unsigned char const ek[CRYPTO_PUBLICKEYBYTES])
{
int rc = 0;
rc = (crypto_kem_check_pk(ek) == 0) ? 1 : 0;
printf("testPassed=%d\n", rc);
}

static void acvp_mlkem_encapDecp_VAL_decapsulationKeyCheck(
unsigned char const dk[MLKEM_INDCCA_SECRETKEYBYTES])
unsigned char const dk[CRYPTO_SECRETKEYBYTES])
{
int rc = 0;
rc = (crypto_kem_check_sk(dk) == 0) ? 1 : 0;
Expand All @@ -175,8 +175,8 @@ static void acvp_mlkem_encapDecp_VAL_decapsulationKeyCheck(
static void acvp_mlkem_keyGen_AFT(unsigned char const z[MLKEM_SYMBYTES],
unsigned char const d[MLKEM_SYMBYTES])
{
unsigned char ek[MLKEM_INDCCA_PUBLICKEYBYTES];
unsigned char dk[MLKEM_INDCCA_SECRETKEYBYTES];
unsigned char ek[CRYPTO_PUBLICKEYBYTES];
unsigned char dk[CRYPTO_SECRETKEYBYTES];

unsigned char zd[2 * MLKEM_SYMBYTES];
memcpy(zd, d, MLKEM_SYMBYTES);
Expand Down Expand Up @@ -277,7 +277,7 @@ int main(int argc, char *argv[])
{
case encapsulation:
{
unsigned char ek[MLKEM_INDCCA_PUBLICKEYBYTES];
unsigned char ek[CRYPTO_PUBLICKEYBYTES];
unsigned char m[MLKEM_SYMBYTES];
/* Encapsulation only for "AFT" */
if (type != AFT)
Expand Down Expand Up @@ -305,8 +305,8 @@ int main(int argc, char *argv[])
}
case decapsulation:
{
unsigned char dk[MLKEM_INDCCA_SECRETKEYBYTES];
unsigned char c[MLKEM_INDCCA_CIPHERTEXTBYTES];
unsigned char dk[CRYPTO_SECRETKEYBYTES];
unsigned char c[CRYPTO_CIPHERTEXTBYTES];
/* Decapsulation only for "VAL" */
if (type != VAL)
{
Expand All @@ -333,7 +333,7 @@ int main(int argc, char *argv[])
}
case encapsulationKeyCheck:
{
unsigned char ek[MLKEM_INDCCA_PUBLICKEYBYTES];
unsigned char ek[CRYPTO_PUBLICKEYBYTES];
/* encapsulationKeyCheck only for "VAL" */
if (type != VAL || argc == 0)
{
Expand All @@ -359,7 +359,7 @@ int main(int argc, char *argv[])
}
case decapsulationKeyCheck:
{
unsigned char dk[MLKEM_INDCCA_SECRETKEYBYTES];
unsigned char dk[CRYPTO_SECRETKEYBYTES];
/* Encapsulation only for "VAL" */
if (type != VAL || argc == 0)
{
Expand Down
18 changes: 9 additions & 9 deletions test/src/test_stack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
#include <stdlib.h>
#include <string.h>

#include "kem.h"
#include "mlkem_native.h"

static void test_keygen_only(void)
{
unsigned char pk[MLKEM_INDCCA_PUBLICKEYBYTES];
unsigned char sk[MLKEM_INDCCA_SECRETKEYBYTES];
unsigned char pk[CRYPTO_PUBLICKEYBYTES];
unsigned char sk[CRYPTO_SECRETKEYBYTES];

/* Only call keypair - this is what we're measuring */
/* Uses the notrandombytes implementation for deterministic randomness */
Expand All @@ -21,9 +21,9 @@ static void test_keygen_only(void)

static void test_encaps_only(void)
{
unsigned char pk[MLKEM_INDCCA_PUBLICKEYBYTES] = {0};
unsigned char ct[MLKEM_INDCCA_CIPHERTEXTBYTES];
unsigned char ss[MLKEM_SSBYTES];
unsigned char pk[CRYPTO_PUBLICKEYBYTES] = {0};
unsigned char ct[CRYPTO_CIPHERTEXTBYTES];
unsigned char ss[CRYPTO_BYTES];

/* Only call encaps - this is what we're measuring */
/* pk is zero-initialized (invalid key, but OK for stack measurement) */
Expand All @@ -33,9 +33,9 @@ static void test_encaps_only(void)

static void test_decaps_only(void)
{
unsigned char sk[MLKEM_INDCCA_SECRETKEYBYTES] = {0};
unsigned char ct[MLKEM_INDCCA_CIPHERTEXTBYTES] = {0};
unsigned char ss[MLKEM_SSBYTES];
unsigned char sk[CRYPTO_SECRETKEYBYTES] = {0};
unsigned char ct[CRYPTO_CIPHERTEXTBYTES] = {0};
unsigned char ss[CRYPTO_BYTES];

/* Only call decaps - this is what we're measuring */
/* sk and ct are zero-initialized (invalid, but OK for stack measurement) */
Expand Down