Skip to content

Commit

Permalink
JSON errors
Browse files Browse the repository at this point in the history
  • Loading branch information
jakemas committed Dec 18, 2024
1 parent b4910fa commit 1835929
Showing 1 changed file with 18 additions and 20 deletions.
38 changes: 18 additions & 20 deletions util/fipstools/acvp/modulewrapper/modulewrapper.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1354,26 +1354,6 @@ static bool GetConfig(const Span<const uint8_t> args[],
"parameterSets": ["ML-KEM-512", "ML-KEM-768", "ML-KEM-1024"],
"functions": ["encapsulation", "decapsulation"]
},)"
R"({
"algorithm": "ML-DSA",
"mode": "keyGen",
"revision": "FIPS204",
"parameterSets": ["ML-DSA-44", "ML-DSA-65", "ML-DSA-87"]
},
{
"algorithm": "ML-DSA",
"mode": "sigGen",
"revision": "FIPS204",
"parameterSets": ["ML-DSA-44", "ML-DSA-65", "ML-DSA-87"],
"deterministic": [false],
"messageLength": [{"min": 8, "max": 65536", "increment": 8}]
},
{
"algorithm": "ML-DSA",
"mode": "sigVer",
"revision": "FIPS204",
"parameterSets": ["ML-DSA-44", "ML-DSA-65", "ML-DSA-87"]
},)"
R"({
"algorithm": "EDDSA",
"mode": "keyGen",
Expand All @@ -1398,6 +1378,24 @@ static bool GetConfig(const Span<const uint8_t> args[],
"curve": ["ED-25519"],
"pure": true,
"preHash": false
},)"
R"({
"algorithm": "ML-DSA",
"mode": "keyGen",
"revision": "FIPS204",
"parameterSets": ["ML-DSA-44", "ML-DSA-65", "ML-DSA-87"]
},{
"algorithm": "ML-DSA",
"mode": "sigGen",
"revision": "FIPS204",
"parameterSets": ["ML-DSA-44", "ML-DSA-65", "ML-DSA-87"],
"deterministic": [false],
"messageLength": [{"min": 8, "max": 65536", "increment": 8}]
},{
"algorithm": "ML-DSA",
"mode": "sigVer",
"revision": "FIPS204",
"parameterSets": ["ML-DSA-44", "ML-DSA-65", "ML-DSA-87"]
}])";
return write_reply({Span<const uint8_t>(
reinterpret_cast<const uint8_t *>(kConfig), sizeof(kConfig) - 1)});
Expand Down

0 comments on commit 1835929

Please sign in to comment.