Add mldsa-native and pqcp driver #652

gilles-peskine-arm · 2026-01-12T18:24:19Z

Create a pqcp driver.
Add mldsa-native as a submodule.
Include mldsa-native in the pqcp driver build.

Resolves #628. Resolves #655 since the WIndows CI is passing.

Note to reviewers: non-goals:

A solid integration configuration is out of scope. We'll review that later in Review mldsa-native integration #653. I'm not sure there are any more things we should configure (except SHAKE integration, which is a separate task, and other parameter sets, which is not planned yet). But if there are, now is not the time.
There's no functionality goal yet. I just want a passing build that includes mldsa-native (which is enabled in the full config).

Needs preceding PR:

Framework stuff: Framework support for the pqcp driver mbedtls-framework#271
More framework stuff: Framework support for the pqcp driver, again mbedtls-framework#273
CMakeLists.txt in mbedtls isn't split: CMake: Declare pqcp driver to mbedtls mbedtls#10569
One more path update for psasim, either in mbedtls or in the framework depending on whether I wait for Move psasim into framework mbedtls-framework#238
~~The Windows build fails.~~ Fix mldsa-native integration on MSVC #655 is solved upstream. This should make the WIndows build pass.
Restore the Windows build — let's make sure it passes before we merge this.

PR checklist

changelog not required because: no user-visible feature
framework PR provided Framework support for the pqcp driver mbedtls-framework#271
mbedtls development PR not required because: crypto only
mbedtls 3.6 PR not required because: new feature
tests provided

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Make it large enough for reasonable ML-DSA tests. Keep the old value (which is just barely large enough) when ML-DSA is disabled. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

These options are transitory. Eventually we'll want to deduce the MLDSA build options from `PSA_WANT_xxx` and `MBEDTLS_PSA_ACCEL_xxx`. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Just a stub for now, to get the build going. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Point to the head of `development`, which is somewhere past the 1.0.0-alpha upstream release, with one patch from us to adjust user-facing documentation. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Define options for mldsa-native that are visible both when building the code and when using it inside TF-PSA-Crypto. * Declare our namespace. * Set up a multilevel build. * Disable features we won't use: random, supercop. * Use our zeroize function. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

This way we can have build scripts that don't know about the pqcp driver, and they will work as long as the library configuration doesn't enable a PQCP feature (i.e. ML-DSA). Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Currently, the libtestdriver1 build in tests/Makefile in Mbed TLS creates empty files `everest/Makefile.inc` and `p256-m/Makefile.inc` in the libtestdriver1 tree, but does not know about `pqcp/Makefile.inc` which came along later. Instead of requiring these files to exist, just don't try to include them. Either way, libtestdriver1.a can't use any code from third-party drivers. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

When we build libtestdriver1, the generated files are already present in the original source tree, and we copy them to the libtestdriver1 tree. Thus we don't need to generate them in the libtestdriver1 tree. Skip all the code that tries to generate them, including file enumeration and dependencies. The current version of `generate_config_checks.py` doesn't work in the libtestdriver1 tree. This caused error messages when the makefile ran `generate_config_checks.py --list`, but the build worked anyway because the necessary targets were already present. So the practical consequence of this commit is to suppress a confusing but effectively harmless error trace. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

gilles-peskine-arm · 2026-01-14T10:31:40Z

@ronald-cron-arm I would appreciate a design review (no need to do a code review) on the file structure and CMake build. It's passing the CI (as of e663621, the remaining CI failures are not related to the build system) but I don't know if I've done things right.

One thing I wonder is if we should have three places for headers in a driver and not just two:

Public headers that need to be installed with the library (e.g. definitions of context structures). This obviously goes under include.
Headers needed for the core to call driver entry points. include or src?
Headers used inside the driver. This does into src.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

valeriosetti

A part from the very 2 minimal typos the rest look good to me!

I noticed that you updated the framework twice, which is fine of course because you are updating it in a progressive way, but in case of conflicts it might be pain to refresh. I don't mind if you want to just update the framework once as first commit.

valeriosetti · 2026-01-16T15:55:02Z

include/psa/crypto_config.h

+ * \warning This option is experimental. It may change or be removed without
+ *          notice.
+ *
+ * Module:  drivers/pqca/mldsa-native


Suggested change

* Module: drivers/pqca/mldsa-native

* Module: drivers/pqcp/mldsa-native

valeriosetti · 2026-01-16T15:55:14Z

include/psa/crypto_config.h

+ *
+ * Requires: TF_PSA_CRYPTO_PQCP_MLDSA_ENABLED
+ *
+ * Module:  drivers/pqca/mldsa-native


Suggested change

* Module: drivers/pqca/mldsa-native

* Module: drivers/pqcp/mldsa-native

valeriosetti · 2026-01-16T16:23:23Z

tests/suites/test_suite_pqcp_mldsa.function

+    TEST_CALLOC(signature, signature_size);
+
+    /* Calculate the expanded key pair from the seed */
+    TEST_EQUAL(tf_psa_crypto_pqcp_mldsa87_keypair_internal(


Sorry for the dumb question, but I cannot find the definition of tf_psa_crypto_pqcp_mldsa87_keypair_internal. What am I missing?

pqcp-config.h defines #define MLD_CONFIG_NAMESPACE_PREFIX tf_psa_crypto_pqcp_mldsa. Heavy use of the preprocessor turns this into a name in a function declaration in mldsa-native/mldsa/mldsa_native.h and in a function definition in mldsa-native/mldsa/src/*.c. I'll add some comments to explain this.

A missing include directory is fine for our own build, but breaks the build of consuming packages (in the CMake sense), as revealed by `all.sh test_tf_psa_crypto_as_package`. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Explain more precisely how mldsa-native functions end up being called `tf_psa_crypto_pqcp_mldsa87_xxx`. In `pqcp-config.h`, fix an obsolete explanation of the macros that the wrapping code needs to define. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

This reverts commit fb5e160. The compilation failure has been fixed upstream (pq-code-package/mldsa-native#884), and we're picking up the fix in the initial integration (Mbed-TLS/TF-PSA-Crypto#652), so we won't need this temporary workaround for our development branch after all. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Adapt to pq-code-package/mldsa-native#852

Create a pqcp include stub The pqcp driver doesn't need a public include yet. But `drivers.cmake` declares an include directory. When a CMake package includes TF-PSA-Crypto as a sub-package, this include directory must exists, otherwise it breaks the build, as revealed by `all.sh test_tf_psa_crypto_as_package`. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

gilles-peskine-arm · 2026-01-19T17:24:04Z

Once the CI passes and the content is approved, I will do a little history rewriting:

Squash all the submodule update commits.
Squash the fixup commits. This will also fix DCO.
Rebase on top of the merge of the framework prerequisite.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

There are still build scripts that can't find headers in the new pqcp driver, notably libtestdriver1. For the time being, take advantage of the fact that pqcp is not in the default config, so we don't need to update these build scripts yet. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

gilles-peskine-arm added 12 commits January 12, 2026 15:42

Update framework with support for pqcp include paths

78e4db4

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Increase maximum line length in .datax files

18c89ca

Make it large enough for reasonable ML-DSA tests. Keep the old value (which is just barely large enough) when ML-DSA is disabled. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Add configuration options to build mldsa-native (87 only)

830513b

These options are transitory. Eventually we'll want to deduce the MLDSA build options from `PSA_WANT_xxx` and `MBEDTLS_PSA_ACCEL_xxx`. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Create pqcp driver

068248e

Just a stub for now, to get the build going. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Add pqcp driver to the CMake build

9c0be36

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Add pqcp driver to the make build

007e990

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Create test suite for the pqcp driver

3f168d8

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Add mldsa-native submodule

4c4682e

Point to the head of `development`, which is somewhere past the 1.0.0-alpha upstream release, with one patch from us to adjust user-facing documentation. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Let the pqcp MLDSA driver code see the mldsa-native functions

df7f1fc

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Add the mldsa-native code to libtfpsacrypto

0282d40

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Smoke test for the integrated mldsa-native build

98a18bf

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

gilles-peskine-arm added this to Roadmap pull requests (new board) Jan 12, 2026

gilles-peskine-arm added size-s Estimated task size: small (~2d) priority-high High priority - will be reviewed soon needs-ci Needs to pass CI tests labels Jan 12, 2026

github-project-automation bot moved this to In Development in Roadmap pull requests (new board) Jan 12, 2026

This was referenced Jan 12, 2026

Framework support for the pqcp driver Mbed-TLS/mbedtls-framework#271

Merged

Review mldsa-native integration #653

Open

Fix mldsa-native integration on MSVC #655

Open

gilles-peskine-arm added needs-preceding-pr Requires another PR to be merged first needs-work labels Jan 13, 2026

gilles-peskine-arm added 6 commits January 13, 2026 13:40

Pacify GCC 15

65beb33

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Don't include pqcp headers when not needed

51b6273

This way we can have build scripts that don't know about the pqcp driver, and they will work as long as the library configuration doesn't enable a PQCP feature (i.e. ML-DSA). Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

library/Makefile: Detect if we're building libtestdriver1

8da80de

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Don't test the PQCP driver when it's in a server and we're in a client

e663621

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

gilles-peskine-arm requested a review from ronald-cron-arm January 14, 2026 10:29

gilles-peskine-arm added 3 commits January 15, 2026 18:53

pqcp-config.h doesn't need to be visible outside pqcp

b6f749d

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

mld_zeroize_native might as well be a macro

2ab901c

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Update framework with check_names for mldsa-native

c598b4e

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

gilles-peskine-arm requested review from bjwtaylor and valeriosetti January 16, 2026 09:50

gilles-peskine-arm added needs-review Every commit must be reviewed by at least two team members and removed needs-work labels Jan 16, 2026

valeriosetti requested changes Jan 16, 2026

View reviewed changes

valeriosetti reviewed Jan 16, 2026

View reviewed changes

gilles-peskine-arm added 4 commits January 19, 2026 12:45

pqcp has no public include yet

1b66cae

A missing include directory is fine for our own build, but breaks the build of consuming packages (in the CMake sense), as revealed by `all.sh test_tf_psa_crypto_as_package`. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Update submodules

b1f133a

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

Fix mldsa-native module location

da66a5e

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

gilles-peskine-arm mentioned this pull request Jan 19, 2026

Revert "Disable mldsa-native integration on Windows" Mbed-TLS/mbedtls-test#247

Merged

gilles-peskine-arm added needs-work and removed needs-review Every commit must be reviewed by at least two team members labels Jan 19, 2026

gilles-peskine-arm added 3 commits January 19, 2026 13:31

fixup! mld_zeroize_native might as well be a macro

2516faf

Adapt to pq-code-package/mldsa-native#852

fixup! amend! pqcp has no public include yet

20d960a

gilles-peskine-arm removed the needs-work label Jan 19, 2026

This was referenced Jan 20, 2026

CMake: Declare pqcp driver to mbedtls Mbed-TLS/mbedtls#10569

Merged

Framework support for the pqcp driver, again Mbed-TLS/mbedtls-framework#273

Merged

Update framework with mbedtls build fix in generate_psa_tests.py

75b8382

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

gilles-peskine-arm removed the needs-preceding-pr Requires another PR to be merged first label Jan 22, 2026

gilles-peskine-arm mentioned this pull request Jan 22, 2026

Consolidate the list of header directories of TF-PSA-Crypto #674

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add mldsa-native and pqcp driver #652

Add mldsa-native and pqcp driver #652

Uh oh!

gilles-peskine-arm commented Jan 12, 2026 •

edited

Loading

Uh oh!

gilles-peskine-arm commented Jan 14, 2026 •

edited

Loading

Uh oh!

valeriosetti left a comment

Uh oh!

valeriosetti Jan 16, 2026

Uh oh!

valeriosetti Jan 16, 2026

Uh oh!

valeriosetti Jan 16, 2026

Uh oh!

gilles-peskine-arm Jan 16, 2026

Uh oh!

gilles-peskine-arm commented Jan 19, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	* Module: drivers/pqca/mldsa-native
	* Module: drivers/pqcp/mldsa-native

Add mldsa-native and pqcp driver #652

Are you sure you want to change the base?

Add mldsa-native and pqcp driver #652

Uh oh!

Conversation

gilles-peskine-arm commented Jan 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR checklist

Uh oh!

gilles-peskine-arm commented Jan 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

valeriosetti left a comment

Choose a reason for hiding this comment

Uh oh!

valeriosetti Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

valeriosetti Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

valeriosetti Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

gilles-peskine-arm Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

gilles-peskine-arm commented Jan 19, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

gilles-peskine-arm commented Jan 12, 2026 •

edited

Loading

gilles-peskine-arm commented Jan 14, 2026 •

edited

Loading