Added support for SHAKE-128/256 FIPS202. The changes are no longer supported the inBit, inEmpty, and outBit, and support for custom messageLength was added.

Author: Joel Brockman

src/sha3/sections/03-supported.adoc

@@ -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.

src/sha3/sections/05-capabilities.adoc

@@ -44,8 +44,12 @@ 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": 10, "Max": 65536, "Inc": 8} |
 |===
 
+NOTE: For SHAKE FIPS202 - inBit, inEmpty, and outBit support were removed, while support for custom MessageLengths was added.
+
 The following is a example JSON object advertising support for SHA3-256 for testing revision 1.0.
 
 [source, json]
@@ -60,22 +64,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.
 
 [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": 16,
+        "max": 1024
+        }
     ]
 }
 ----

src/sha3/sections/06-test-vectors.adoc

@@ -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.
 
@@ -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]
 ----

src/sha3/sections/07-responses.adoc

@@ -143,7 +143,7 @@ The following are examples of JSON objects for secure hash test results sent fro
 }
 ----
 
-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]
 ----