Rust mlkem Fenrir fixes 2026-08-27 by holtrop-wolfssl · Pull Request #11302 · wolfSSL/wolfssl

holtrop-wolfssl · 2026-08-27T13:22:01Z

Description

commit 7e25ece857826b092b69fe11bf088ef51298d026
Author: Josh Holtrop <josh@wolfssl.com>
Date:   Thu Aug 27 09:20:13 2026 -0400

    Rust wrapper: only enable mlkem cfg when !WC_NO_CONSTRUCTORS
    
    Fixes F-11270

commit e67c45922859b76f19af89252324dee7f6f95857
Author: Josh Holtrop <josh@wolfssl.com>
Date:   Thu Aug 27 08:56:35 2026 -0400

    Rust wrapper: mlkem: generate operation-specific cfgs for mlkem features
    
    Fixes F-8298

Testing

How did you test?

Checklist

added tests
updated/added doxygen
updated appropriate READMEs
Updated manual and documentation

wolfSSL-Bot · 2026-08-27T13:24:55Z

Can one of the admins verify this patch?

github-actions · 2026-08-27T13:32:36Z

holtrop-wolfssl · 2026-08-27T18:47:52Z

retest this please (Calling Pipeline was cancelled)

holtrop-wolfssl · 2026-08-28T17:44:29Z

retest this please (build removed)

holtrop-wolfssl · 2026-08-31T12:30:53Z

retest this please (build removed)

Copilot

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

philljj

All looks good except for one define guard question in wolfcrypt test.c

Fixes F-8298

Fixes F-11270

wolfSSL-Fenrir-bot

Fenrir Automated Review — PR #11302

Scan targets checked: wolfcrypt-bugs, wolfcrypt-port-bugs, wolfcrypt-rs-bugs, wolfcrypt-rs-src, wolfcrypt-src, wolfssl-bugs, wolfssl-src
Findings: 6
5 finding(s) posted as inline comments (see file-level comments below)

Required changes (1)

`test_sizes_match_runtime` exercises all three parameter sets without level gates

File: wrapper/rust/wolfssl-wolfcrypt/tests/test_mlkem_kem.rs:37
Function: test_sizes_match_runtime
Category: Missing/incorrect platform conditionals

MlKem::new() returns Err when wc_MlKemKey_Init reports NOT_COMPILED_IN for a disabled level (wc_mlkem.c:390-408), so the .expect("new TYPE_512") calls panic when WOLFSSL_NO_ML_KEM_512/768/1024 is set. The PR added mlkem_512/768/1024 cfgs but did not apply them here.

Recommendation: Split this test per parameter set and gate each part on the matching mlkem_512/mlkem_768/mlkem_1024 cfg.

This review was generated automatically by Fenrir. Reported findings require changes before merge.

wolfSSL-Fenrir-bot · 2026-09-05T00:17:18Z

@@ -52,6 +52,7 @@ fn test_sizes_match_runtime() {

 /// Generate, encapsulate, and decapsulate with ML-KEM-512 via the kem traits.
 #[test]


test_ek_try_new_zeroed_key missing #[cfg(mlkem_768)] gate · Copy-paste errors

MlKem768EncapsulationKey is now generated only under #[cfg(mlkem_768)] in mlkem_kem.rs, but this test references it without a gate while every sibling 768 test received one. Builds with ML-KEM-768 disabled fail to compile the test crate (E0433).

Fix: Add #[cfg(mlkem_768)] to test_ek_try_new_zeroed_key, matching the other ML-KEM-768 tests in the file.

wolfSSL-Fenrir-bot · 2026-09-05T00:17:18Z

 */

-#![cfg(all(mlkem, random, feature = "kem", feature = "rand_core"))]
+#![cfg(all(mlkem_encapsulate, mlkem_decapsulate, mlkem_make_key, random, feature = "kem", feature = "rand_core"))]


test_mlkem_kem.rs module gate drops the mlkem cfg, breaking WC_NO_CONSTRUCTORS builds · Missing/incorrect platform conditionals

The gate was changed from mlkem to the three operation cfgs. Under WC_NO_CONSTRUCTORS the operation cfgs are still set while mlkem is off, so this file compiles but wolfssl_wolfcrypt::mlkem::MlKem (empty module) and wolfssl_wolfcrypt::mlkem_kem (not declared in lib.rs:72) fail to resolve. Adjacent to known finding #11270, which covers scan_cfg in build.rs, not this test gate.

Fix: Add mlkem back into the all(...) list in the module-level cfg.

wolfSSL-Fenrir-bot · 2026-09-05T00:17:18Z

 /// arrive at the same shared secret.
 #[test]
-#[cfg(random)]
+#[cfg(all(mlkem_make_key, mlkem_encapsulate, mlkem_decapsulate, random))]


test_mlkem.rs level-specific tests are not gated on the new per-level cfgs · Missing/incorrect platform conditionals

test_encap_decap_type512, test_encap_decap_type768 (:114), test_encap_decap_type1024 (:148) and the TYPE_768 tests at :173/:202/:237/:271 received operation cfgs but no mlkem_512/mlkem_768/mlkem_1024 gate, so they panic on NOT_COMPILED_IN when that parameter set is disabled. test_encap_decap_all_types (:306) iterates all three levels unconditionally.

Fix: Add the matching mlkem_512/mlkem_768/mlkem_1024 cfg to each level-specific test and gate the per-type loop iterations.

wolfSSL-Fenrir-bot · 2026-09-05T00:17:18Z


 ```rust
-#[cfg(all(mlkem, random))]
+#[cfg(all(mlkem_make_key, mlkem_encapsulate, mlkem_decapsulate, random))]


mlkem.rs doc examples use TYPE_768 without an mlkem_768 cfg · Missing/incorrect platform conditionals

The doctests updated by this PR (lines 41, 116, 148, 192, 224, 457, 523, 594, 650, 689, 726, 765) all call MlKem::…(MlKem::TYPE_768, …).expect(…) but gate only on operation cfgs, so they panic under WOLFSSL_NO_ML_KEM_768. The equivalent example in mlkem_kem.rs:46 does include mlkem_768.

Fix: Add mlkem_768 to the cfg list of every mlkem.rs doc example that constructs a TYPE_768 key.

wolfSSL-Fenrir-bot · 2026-09-05T00:17:18Z

+    check_cfg(&binding, "wc_MlKemKey_MakeKey", "mlkem_make_key");
+    check_cfg(&binding, "wc_MlKemKey_Encapsulate", "mlkem_encapsulate");
+    check_cfg(&binding, "wc_MlKemKey_Decapsulate", "mlkem_decapsulate");
+    check_cfg(&binding, "WC_ML_KEM_512_K", "mlkem_512");


New mlkem_512/768/1024 cfgs are set in --enable-mlkem=original builds where the ML-KEM type values are rejected · Incorrect feature flag gating

--enable-mlkem=original sets WOLFSSL_MLKEM_KYBER plus WOLFSSL_NO_ML_KEM, which still defines WOLFSSL_WC_ML_KEM_512/768/1024 and therefore WC_ML_KEM_*_K (wc_mlkem.h:78-90, 106). All three cfgs get set, but wc_MlKemKey_Init has no WC_ML_KEM_* cases under WOLFSSL_NO_ML_KEM (wc_mlkem.c:390-434) and returns BAD_FUNC_ARG, so the gated impl_mlkem_kem! adapters still panic in MlKem::new(...).expect(...). Adjacent to known finding #12238, which the per-level cfgs were added to fix; this build configuration is not covered.

Related known finding #11270 (similar but distinct): Both are in scan_cfg ML-KEM gating and expose wrapper APIs from insufficient probes, but #11270 gates the whole module on wc_MlKemKey_Init under WC_NO_CONSTRUCTORS, where New/Delete are absent; this candidate gates per-level adapters on constants that remain defined under WOLFSSL_NO_ML_KEM, where Init rejects those types. The faulting operations, configurations, root causes, and required probes/patches differ.

Fix: Probe a symbol that is absent under WOLFSSL_NO_ML_KEM (e.g. WC_ML_KEM_512_PUBLIC_KEY_SIZE gated additionally on ML-KEM being enabled) so Kyber-original builds do not set the per-level cfgs.

holtrop-wolfssl self-assigned this Aug 27, 2026

Copilot AI lite review requested due to automatic review settings August 27, 2026 13:22

Copilot started reviewing on behalf of holtrop-wolfssl August 27, 2026 13:24 View session

holtrop-wolfssl removed the request for review from Copilot August 27, 2026 13:25

holtrop-wolfssl assigned wolfSSL-Bot and unassigned holtrop-wolfssl Aug 31, 2026

philljj requested a balanced review from Copilot August 31, 2026 19:49

Copilot AI reviewed Aug 31, 2026

philljj approved these changes Aug 31, 2026

View reviewed changes

philljj reviewed Aug 31, 2026

View reviewed changes

Comment thread wolfcrypt/test/test.c

philljj requested changes Aug 31, 2026

View reviewed changes

philljj assigned holtrop-wolfssl and unassigned wolfSSL-Bot Aug 31, 2026

holtrop-wolfssl added 2 commits September 1, 2026 14:28

Rust wrapper: mlkem: generate operation-specific cfgs for mlkem features

e8975c5

Fixes F-8298

Rust wrapper: only enable mlkem cfg when !WC_NO_CONSTRUCTORS

9547114

Fixes F-11270

holtrop-wolfssl force-pushed the rust-mlkem-fenrir-fixes branch from 7e25ece to 9547114 Compare September 1, 2026 18:28

holtrop-wolfssl requested a review from philljj September 1, 2026 18:29

holtrop-wolfssl assigned wolfSSL-Bot and unassigned holtrop-wolfssl Sep 1, 2026

philljj approved these changes Sep 4, 2026

View reviewed changes

philljj requested a review from wolfSSL-Fenrir-bot September 4, 2026 23:34

wolfSSL-Fenrir-bot requested changes Sep 5, 2026

View reviewed changes

		@@ -52,6 +52,7 @@ fn test_sizes_match_runtime() {

		/// Generate, encapsulate, and decapsulate with ML-KEM-512 via the kem traits.
		#[test]

Uh oh!

Conversation

holtrop-wolfssl commented Aug 27, 2026

Description

Testing

Checklist

Uh oh!

wolfSSL-Bot commented Aug 27, 2026

Uh oh!

github-actions Bot commented Aug 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

MemBrowse Memory Report

Uh oh!

holtrop-wolfssl commented Aug 27, 2026

Uh oh!

holtrop-wolfssl commented Aug 28, 2026

Uh oh!

holtrop-wolfssl commented Aug 31, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

philljj left a comment

Choose a reason for hiding this comment

Uh oh!

wolfSSL-Fenrir-bot left a comment

Choose a reason for hiding this comment

Fenrir Automated Review — PR #11302

Required changes (1)

test_sizes_match_runtime exercises all three parameter sets without level gates

Uh oh!

wolfSSL-Fenrir-bot Sep 5, 2026

Choose a reason for hiding this comment

Uh oh!

wolfSSL-Fenrir-bot Sep 5, 2026

Choose a reason for hiding this comment

Uh oh!

wolfSSL-Fenrir-bot Sep 5, 2026

Choose a reason for hiding this comment

Uh oh!

wolfSSL-Fenrir-bot Sep 5, 2026

Choose a reason for hiding this comment

Uh oh!

wolfSSL-Fenrir-bot Sep 5, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

github-actions Bot commented Aug 27, 2026 •

edited

Loading

`test_sizes_match_runtime` exercises all three parameter sets without level gates