Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
2 changes: 2 additions & 0 deletions src/sha3/sections/03-supported.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,7 @@ The following SHA3-based hash algorithms *MAY* be advertised by this ACVP compli
* SHA3-512 / null / 2.0
* SHAKE-128 / null / 1.0
* SHAKE-256 / null / 1.0
* SHAKE-128 / null / FIPS202
* SHAKE-256 / null / FIPS202

Other hash algorithms *MAY* be advertised by the ACVP module elsewhere.
1 change: 1 addition & 0 deletions src/sha3/sections/04-testtypes.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ For 100 iterations

[[SHAKE-MCT]]
==== SHAKE Monte Carlo Test
NOTE: The SHAKE "FIPS202" testing revision does not support MCT.

The MCTs start with an initial condition (SEED which is a single message) and perform a series of chained computations. Some values used in the algorithm are based on properties provided during the registration. They are as follows.

Expand Down
15 changes: 10 additions & 5 deletions src/sha3/sections/05-capabilities.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ The following grid outlines which properties are *REQUIRED*, as well as all the
| SHA3-512| 2.0 | | | | | {"Min": 0, "Max": 65536, "Inc": any} | [1, 2, 4, 8]
| SHAKE-128| 1.0 | true, false| true, false| {"Min": 16, "Max": 65536, "Inc": any}| true, false | |
| SHAKE-256| 1.0 | true, false| true, false| {"Min": 16, "Max": 65536, "Inc": any}| true, false | |
| SHAKE-128| FIPS202 | | | {"Min": 16, "Max": 65536, "Inc": any}| | {"Min": 0, "Max": 65536, "Inc": 8} |
| SHAKE-256| FIPS202 | | | {"Min": 16, "Max": 65536, "Inc": any}| | {"Min": 0, "Max": 65536, "Inc": 8} |
|===

The following is a example JSON object advertising support for SHA3-256 for testing revision 1.0.
Expand All @@ -60,22 +62,25 @@ The following is a example JSON object advertising support for SHA3-256 for test
}
----

The following is an example JSON object advertising support for SHAKE-128.
The following is an example JSON object advertising support for SHAKE-128 FIPS202.
Comment thread
jbrock24 marked this conversation as resolved.

[source, json]
----
{
"algorithm": "SHAKE-128",
"revision": "1.0",
"revision": "FIPS202",
"mode": null,
"inBit": true,
"inEmpty": true,
"outBit": true,
"outputLen": [
{
"min": 16,
"max": 1024
}
],
"messageLength": [
{
"min": 0,
"max": 65536
}
]
}
----
Expand Down
4 changes: 2 additions & 2 deletions src/sha3/sections/06-test-vectors.adoc
Comment thread
jbrock24 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Each test group *SHALL* contain an array of one or more test cases. Each test c
| largeMsg | Object describing the message for an LDT group | large data object, see <<LD_test>> for more information
|===

NOTE: The maximum value for SHAKE-128 for 'len' is 65,904 bits when the inBit parameter is set to true in the capabilities registration and 66,240 bits when it is set to false. The maximum value for SHAKE-256 for 'len' is 66,428 bits when the inBit parameter is set to true in the capabilities registration and 65,752 bits when it is set to false.
NOTE: The maximum value for SHAKE-128 v1.0 for 'len' is 65,904 bits when the inBit parameter is set to true in the capabilities registration and 66,240 bits when it is set to false. The maximum value for SHAKE-256 v1.0 for 'len' is 66,428 bits when the inBit parameter is set to true in the capabilities registration and 65,752 bits when it is set to false.

The following are example JSON objects for secure hash test vectors sent from the ACVP server to the crypto module. Notice that the single bit message is represented as "01". This complies with the little-endian nature of SHA3. All hex displayed is little-endian bit order when associated with SHA3 or any of its variations.

Expand Down Expand Up @@ -97,7 +97,7 @@ The following are example JSON objects for secure hash test vectors sent from th
]
----

The following is an example JSON object for SHAKE.
The following is an example JSON object for SHAKE v1.0.

[source, json]
----
Expand Down
2 changes: 1 addition & 1 deletion src/sha3/sections/07-responses.adoc
Comment thread
jbrock24 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ The following are examples of JSON objects for secure hash test results sent fro
}
----

Comment thread
jbrock24 marked this conversation as resolved.
The following is an example JSON object response for SHAKE-128. The group identified by tgId 1 is a group of AFTs. The group identified by tgId 2 is a group of MCTs. The group identified by tgId 3 is a group of VOTs.
The following is an example JSON object response for SHAKE-128 v1.0. The group identified by tgId 1 is a group of AFTs. The group identified by tgId 2 is a group of MCTs. The group identified by tgId 3 is a group of VOTs.

[source, json]
----
Expand Down