ACVP test harness for ML-DSA #2127

jakemas · 2025-01-17T21:15:07Z

Issues:

Resolves #CryptoAlg-2819

Description of changes:

Implements:

Additional Details

Added testing for ML-DSA configured withdeterministic = true externalmu = true, false signatureInterface = internal for parameterSet = ML-DSA-44, ML-DSA-65, ML-DSA-87.

We add the ML-DSA sigGen Test Case JSON Schema:

type mlDsaSigGenTestGroup struct {
	ID                 uint64 `json:"tgId"`
	Type               string `json:"testType"`
	ParameterSet       string `json:"parameterSet"`
	Deterministic      bool   `json:"deterministic"`
	SignatureInterface string `json:"signatureInterface"`
	ExternalMu         bool   `json:"externalMu`
	Tests         []struct {
		ID      uint64               `json:"tcId"`
		Message hexEncodedByteString `json:"message"`
		MU      hexEncodedByteString `json:"mu"`
		SK      hexEncodedByteString `json:"sk"`
		RND     hexEncodedByteString `json:"rnd"`
		Context hexEncodedByteString `json:"context"`
		HashAlg string               `json:"hashAlg"`
	}
}

and ML-DSA sigVer Test Case JSON Schema:

type mlDsaSigVerTestGroup struct {
	ID                 uint64 `json:"tgId"`
	Type               string `json:"testType"`
	ParameterSet       string `json:"parameterSet"`
	Deterministic      bool   `json:"deterministic"`
	SignatureInterface string `json:"signatureInterface"`
	ExternalMu         bool   `json:"externalMu`
	Tests        []struct {
		ID        uint64               `json:"tcId"`
		PK        hexEncodedByteString `json:"pk"`
		Message   hexEncodedByteString `json:"message"`
		MU        hexEncodedByteString `json:"mu"`
		Signature hexEncodedByteString `json:"signature"`
		Context   hexEncodedByteString `json:"context"`
                HashAlg   string               `json:"hashAlg"`
	}
}

Testing:

Running ACVP tests
2025/01/17 14:09:39 40 ACVP tests matched expectations
2025/01/17 14:09:40 1 ACVP tests matched expectations
2025/01/17 14:09:41 1 ACVP tests matched expectations
2025/01/17 14:09:42 1 ACVP tests matched expectations
2025/01/17 14:09:44 1 ACVP tests matched expectations
2025/01/17 14:09:46 1 ACVP tests matched expectations
2025/01/17 14:09:48 1 ACVP tests matched expectations
2025/01/17 14:09:50 1 ACVP tests matched expectations
2025/01/17 14:09:52 1 ACVP tests matched expectations
2025/01/17 14:10:09 1 ACVP tests matched expectations
2025/01/17 14:10:10 1 ACVP tests matched expectations
2025/01/17 14:10:11 1 ACVP tests matched expectations
2025/01/17 14:10:12 1 ACVP tests matched expectations
2025/01/17 14:10:12 1 ACVP tests matched expectations

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license.

util/fipstools/acvp/modulewrapper/modulewrapper.cc

util/fipstools/acvp/acvptool/test/vectors/ML-DSA.bz2

andrewhop · 2025-01-17T22:27:20Z

util/fipstools/acvp/modulewrapper/modulewrapper.cc

+              "min": 8,
+              "max": 65536,


Why this min/max? Does this affect what is tested or what is approved?

FIPS 204 defines the context string as a" byte string of 255 or fewer bytes which can be empty (default)".

Should this test min 0, max 255?

Reading through the document again, I see now that messageLength is the length of the message to be signed. contextLength is the length of the context string.

Looking at Table 7 https://pages.nist.gov/ACVP/draft-celi-acvp-ml-dsa.html#name-ml-dsa-siggen-capability-pr, which is where this capabilities string comes from, you'll see that message length's valid values are:

Min: 8, Max: 65536, Incr: 8

that's why it is defined this way in my capabilities JSON.

We're not supporting context sign, but you can see in the same table that contextLength is Min: 0, Max: 2040, Incr: 8.

util/fipstools/acvp/acvptool/subprocess/ml_dsa.go

codecov-commenter · 2025-01-17T23:28:36Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (main@5270eca). Learn more about missing BASE report.

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #2127   +/-   ##
=======================================
  Coverage        ?   78.97%           
=======================================
  Files           ?      610           
  Lines           ?   105287           
  Branches        ?    14911           
=======================================
  Hits            ?    83146           
  Misses          ?    21487           
  Partials        ?      654

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

### Issues: Resolves #CryptoAlg-2819 ### Description of changes: Implements: - https://pages.nist.gov/ACVP/draft-celi-acvp-ml-dsa.html - https://github.com/usnistgov/ACVP-Server/tree/master/gen-val/json-files/ML-DSA-keyGen-FIPS204 - https://github.com/usnistgov/ACVP-Server/tree/master/gen-val/json-files/ML-DSA-sigGen-FIPS204 - https://github.com/usnistgov/ACVP-Server/tree/master/gen-val/json-files/ML-DSA-sigVer-FIPS204 ### Additional Details Added testing for ML-DSA configured with`deterministic = true` `externalmu = true, false` `signatureInterface = internal` for `parameterSet = ML-DSA-44, ML-DSA-65, ML-DSA-87`. We add the [ML-DSA sigGen Test Case JSON Schema](https://pages.nist.gov/ACVP/draft-celi-acvp-ml-dsa.html#name-ml-dsa-siggen-test-case-jso): ``` type mlDsaSigGenTestGroup struct { ID uint64 `json:"tgId"` Type string `json:"testType"` ParameterSet string `json:"parameterSet"` Deterministic bool `json:"deterministic"` SignatureInterface string `json:"signatureInterface"` ExternalMu bool `json:"externalMu` Tests []struct { ID uint64 `json:"tcId"` Message hexEncodedByteString `json:"message"` MU hexEncodedByteString `json:"mu"` SK hexEncodedByteString `json:"sk"` RND hexEncodedByteString `json:"rnd"` Context hexEncodedByteString `json:"context"` HashAlg string `json:"hashAlg"` } } ``` and [ML-DSA sigVer Test Case JSON Schema](https://pages.nist.gov/ACVP/draft-celi-acvp-ml-dsa.html#name-ml-dsa-sigver-test-case-jso): ``` type mlDsaSigVerTestGroup struct { ID uint64 `json:"tgId"` Type string `json:"testType"` ParameterSet string `json:"parameterSet"` Deterministic bool `json:"deterministic"` SignatureInterface string `json:"signatureInterface"` ExternalMu bool `json:"externalMu` Tests []struct { ID uint64 `json:"tcId"` PK hexEncodedByteString `json:"pk"` Message hexEncodedByteString `json:"message"` MU hexEncodedByteString `json:"mu"` Signature hexEncodedByteString `json:"signature"` Context hexEncodedByteString `json:"context"` HashAlg string `json:"hashAlg"` } } ``` ### Testing: ``` Running ACVP tests 2025/01/17 14:09:39 40 ACVP tests matched expectations 2025/01/17 14:09:40 1 ACVP tests matched expectations 2025/01/17 14:09:41 1 ACVP tests matched expectations 2025/01/17 14:09:42 1 ACVP tests matched expectations 2025/01/17 14:09:44 1 ACVP tests matched expectations 2025/01/17 14:09:46 1 ACVP tests matched expectations 2025/01/17 14:09:48 1 ACVP tests matched expectations 2025/01/17 14:09:50 1 ACVP tests matched expectations 2025/01/17 14:09:52 1 ACVP tests matched expectations 2025/01/17 14:10:09 1 ACVP tests matched expectations 2025/01/17 14:10:10 1 ACVP tests matched expectations 2025/01/17 14:10:11 1 ACVP tests matched expectations 2025/01/17 14:10:12 1 ACVP tests matched expectations 2025/01/17 14:10:12 1 ACVP tests matched expectations ``` By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license.

jakemas added 3 commits January 17, 2025 13:14

added ACVP test harness for ML-DSA

0ddf5ed

clean up comment

122494f

added test server vectors/expectors

56ed12f

jakemas marked this pull request as ready for review January 17, 2025 22:17

jakemas requested a review from a team as a code owner January 17, 2025 22:17

andrewhop reviewed Jan 17, 2025

View reviewed changes

skmcgrail reviewed Jan 17, 2025

View reviewed changes

util/fipstools/acvp/acvptool/subprocess/ml_dsa.go Outdated Show resolved Hide resolved

spacing nits

54906f6

jakemas and others added 3 commits January 17, 2025 17:14

trimmed vectors

984997a

Merge branch 'main' into acvp-ml-dsa

2842c8c

Merge branch 'main' into acvp-ml-dsa

6545eb0

skmcgrail approved these changes Jan 23, 2025

View reviewed changes

andrewhop approved these changes Jan 24, 2025

View reviewed changes

andrewhop merged commit 1b13cd1 into aws:main Jan 24, 2025
122 of 126 checks passed

jakemas mentioned this pull request Jan 24, 2025

[DRAFT] Add ACVP test framework for ML-DSA #2068

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ACVP test harness for ML-DSA #2127

ACVP test harness for ML-DSA #2127

jakemas commented Jan 17, 2025 •

edited

Loading

andrewhop Jan 17, 2025

jakemas Jan 17, 2025

andrewhop Jan 17, 2025

jakemas Jan 18, 2025 •

edited

Loading

codecov-commenter commented Jan 17, 2025 •

edited

Loading

ACVP test harness for ML-DSA #2127

ACVP test harness for ML-DSA #2127

Conversation

jakemas commented Jan 17, 2025 • edited Loading

Issues:

Description of changes:

Additional Details

Testing:

andrewhop Jan 17, 2025

Choose a reason for hiding this comment

jakemas Jan 17, 2025

Choose a reason for hiding this comment

andrewhop Jan 17, 2025

Choose a reason for hiding this comment

jakemas Jan 18, 2025 • edited Loading

Choose a reason for hiding this comment

codecov-commenter commented Jan 17, 2025 • edited Loading

Codecov Report

jakemas commented Jan 17, 2025 •

edited

Loading

jakemas Jan 18, 2025 •

edited

Loading

codecov-commenter commented Jan 17, 2025 •

edited

Loading