SHA3 2.0 testing information

- usnistgov#1003
Kritner · Nov 17, 2020 · 2ce6797 · 2ce6797
1 parent ae75ff9
commit 2ce6797
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -123,10 +123,14 @@ The demo server allows validation of the following algorithms (a superset of the
 * [SHA-512](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha.txt) - [HTML](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha.html)
 * [SHA-512/224](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha.txt) - [HTML](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha.html)
 * [SHA-512/256](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha.txt) - [HTML](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha.html)
-* [SHA3-224](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha3.txt) - [HTML](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha3.html)
-* [SHA3-256](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha3.txt) - [HTML](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha3.html)
-* [SHA3-384](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha3.txt) - [HTML](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha3.html)
-* [SHA3-512](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha3.txt) - [HTML](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha3.html)
+* [SHA3-224 1.0](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha3.txt) - [HTML](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha3.html)
+* [SHA3-256 1.0](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha3.txt) - [HTML](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha3.html)
+* [SHA3-384 1.0](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha3.txt) - [HTML](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha3.html)
+* [SHA3-512 1.0](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha3.txt) - [HTML](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha3.html)
+* [SHA3-224 2.0](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha3.txt) - [HTML](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha3.html)
+* [SHA3-256 2.0](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha3.txt) - [HTML](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha3.html)
+* [SHA3-384 2.0](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha3.txt) - [HTML](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha3.html)
+* [SHA3-512 2.0](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha3.txt) - [HTML](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha3.html)
 * [SHAKE-128](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha3.txt) - [HTML](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha3.html)
 * [SHAKE-256](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha3.txt) - [HTML](https://usnistgov.github.io/ACVP/draft-celi-acvp-sha3.html)
 

diff --git a/src/sha3/sections/03-supported.adoc b/src/sha3/sections/03-supported.adoc
@@ -4,11 +4,15 @@
 
 The following SHA3-based hash algorithms *MAY* be advertised by this ACVP compliant crypto module:
 
-* SHA3-224
-* SHA3-256
-* SHA3-384
-* SHA3-512
-* SHAKE-128
-* SHAKE-256
+* SHA3-224 / null / 1.0
+* SHA3-256 / null / 1.0
+* SHA3-384 / null / 1.0
+* SHA3-512 / null / 1.0
+* SHA3-224 / null / 2.0
+* SHA3-256 / null / 2.0
+* SHA3-384 / null / 2.0
+* SHA3-512 / null / 2.0
+* SHAKE-128 / null / 1.0
+* SHAKE-256 / null / 1.0
 
 Other hash algorithms *MAY* be advertised by the ACVP module elsewhere.
diff --git a/src/sha3/sections/05-capabilities.adoc b/src/sha3/sections/05-capabilities.adoc
@@ -7,7 +7,7 @@ Each SHA3 and SHAKE algorithm capability advertised *SHALL* be a self-contained
 [[caps_table]]
 
 [cols="<,<,<"]
-.SHA3 and SHAKE Algorithm Capabilities JSON Values
+.SHA3 1.0 and SHAKE 1.0 Algorithm Capabilities JSON Values
 |===
 | JSON Value| Description| JSON type
 
@@ -39,7 +39,7 @@ The following grid outlines which properties are *REQUIRED*, as well as all the
 | SHAKE-256| true, false| true, false| {"Min": 16, "Max": 65536, "Inc": any}| true, false |
 |===
 
-The following is a example JSON object advertising support for SHA3-256.
+The following is a example JSON object advertising support for SHA3-256 for testing revision 1.0.
 
 [source, json]
 ----
@@ -70,3 +70,33 @@ The following is an example JSON object advertising support for SHAKE-128.
     ]
 }
 ----
+
+[cols="<,<,<"]
+.SHA3 2.0 Algorithm Capabilities JSON Values
+
+|===
+| JSON Value| Description| JSON type
+
+| algorithm| The hash algorithm and mode to be validated.| string
+| revision| The algorithm testing revision to use.| string
+| messageLength | Domain representing the message lengths supported. The current MCT implementation requires that the digest size and 3x the digest size of the registered hash algorithm must be a valid value within the registered domain.
+| performLargeDataTest | Determines if the server should include the large data test group defined in <<LD_test>>. This property is *OPTIONAL*, and shall include the lengths in GiB being tested. Valid options are {1, 2, 4, 8}. | integer array
+|===
+
+NOTE: The lengths provided in the 'performLargeDataTest' property are in gibibytes. 1GiB is equivalent to 2^30 bytes. 
+
+The following is a example JSON object advertising support for SHA3-256 for testing revision 2.0.
+
+[source, json]
+----
+{
+    "algorithm": "SHA3-256",
+    "revision": "1.0",
+    "inBit": true,
+    "inEmpty": true,
+    "messageLength": [{"min": 0, "max": 65536, "increment": 1}],
+    "performLargeDataTest": [1, 2, 4, 8]
+}
+----
+
+NOTE: Since the increment is 1 in the above, and the minimum value within the message length is zero, this is effectively an "inBit" and "inEmpty" registration from the 1.0 revision testing.  If the implementation supports only byte length messages, you could use an increment of 8.