Updated documentation to show both SHAKE 1.0 and FIPS202 versions instead of a mix.

Author: Joel Brockman

src/sha3/sections/05-capabilities.adoc

@@ -48,7 +48,7 @@ The following grid outlines which properties are *REQUIRED*, as well as all the
 | 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.
+The following is a example JSON object advertising support for SHA3-256 for testing revision v1.0.
 
 [source, json]
 ----
@@ -62,6 +62,26 @@ 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 v1.0.
+
+[source, json]
+----
+{
+    "algorithm": "SHAKE-128",
+    "revision": "1.0",
+    "mode": null,
+    "inBit": true,
+    "inEmpty": true,
+    "outBit": true,
+    "outputLen": [
+        {
+        "min": 16,
+        "max": 1024
+        }
+    ]
+}
+----
+
 The following is an example JSON object advertising support for SHAKE-128 FIPS202.
 
 [source, json]

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

@@ -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 v1.0.
+The following is an example JSON object for SHAKE-128 v1.0.
 
 [source, json]
 ----
@@ -158,3 +158,43 @@ The following is an example JSON object for SHAKE v1.0.
     }
 ]
 ----
+
+The following is an example JSON object for SHAKE-128 FIPS202.
+
+[source, json]
+----
+[
+  { "acvVersion": <acvp-version> },
+  {
+    "vsId": 12345,
+    "algorithm": "SHAKE-128",
+    "revision": "FIPS202",
+    "testGroups": [
+      {
+        "tgId": 1,
+        "testType": "AFT",
+        "tests": [
+          {
+            "tcId": 1,
+            "msg": "3D955AA590240623A3BFCA54D8...",
+            "len": 31352,
+            "outLen": 504
+          },
+          {
+            "tcId": 2,
+            "msg": "AD2E9023C60D916A51DD73E75D...",
+            "len": 208,
+            "outLen": 360
+          },
+          {
+            "tcId": 3,
+            "msg": "418130A5678E5D1773...",
+            "len": 1104,
+            "outLen": 408
+          }
+        ]
+      }
+    ]
+  }
+]
+----

src/sha3/sections/07-responses.adoc

@@ -35,7 +35,7 @@ The following table describes the JSON elements for each test case object.
 
 | tcId| Numeric identifier for the test case, unique across the entire vector set.| integer
 | md| The IUT's digest response to a VOT, AFT or LDT| string (hex)
-| resultsArray| Array of JSON objects that represent each iteration of a Monte Carlo Test. Each iteration will contain the msg and md (and outLen for SHAKE-128 and SHAKE-256)| array of objects containing the md (and potentially outLen)
+| resultsArray| Array of JSON objects that represent each iteration of a Monte Carlo Test. Each iteration will contain the msg and md (and outLen for SHAKE-128 v1.0 and SHAKE-256 v1.0)| array of objects containing the md (and potentially outLen)
 |===
 
 NOTE: The 'tcId' *MUST* be included in every test case object sent between the client and the server.
@@ -148,7 +148,7 @@ The following is an example JSON object response for SHAKE-128 v1.0. The group i
 [source, json]
 ----
 {
-    "vsId": 0,
+    "vsId": 12345,
     "algorithm": "SHAKE-128",
     "revision": "1.0",
     "testGroups": [
@@ -199,3 +199,38 @@ The following is an example JSON object response for SHAKE-128 v1.0. The group i
     ]
 }
 ----
+
+The following is an example JSON object response for SHAKE-128 FIPS202. The group identified by tgId 1 is a group of AFTs.
+
+[source, json]
+----
+{
+  "vsId": 12345,
+  "algorithm": "SHAKE-128",
+  "revision": "FIPS202",
+  "testGroups": [
+    {
+      "tgId": 1,
+      "tests": [
+            {
+            "tcId": 1,
+            "md": "1991649A5A7766AC93F2C665186C..."
+            },
+            {
+            "tcId": 2,
+            "md": "32C4F0A828FE7704B37FD92EBD34..."
+            },
+            {
+            "tcId": 3,
+            "md": "0386A3F546FC3DD4958D0B1..."
+            },
+            {
+            "tcId": 4,
+            "md": "0942D03460462EFC1A5F0A229D1..."
+            }
+        ]
+    }
+  ]
+}
+----
+