Merge pull request #1459 from usnistgov/fix-rsa-sigprim-mod-naming

Updated modulo to modulus and vice versa
usnistgov · Sep 22, 2023 · 143b311 · 143b311
2 parents a47f697 + c3e6bdb
commit 143b311
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/src/rsa/sections/05-decprim-capabilities.adoc b/src/rsa/sections/05-decprim-capabilities.adoc
@@ -29,7 +29,7 @@ An example registration is the following
 
 === RSA DecryptionPrimitive SP800-56Br2 Mode Capabilities
 
-The RSA decryptionPrimitive mode capabilities are advertised as JSON objects within the array of 'capabilities' as part of the 'capability_exchange' element of the ACVP JSON registration message. Two properties are supported in the registration. A 'modulus' array supports three modulo values of 2048, 3072, and 4096. For private 'keyFormat', the "standard" and "crt" (Chinese Remainder Theorem) private key formats are supported. "standard" equates to the prime-factor private key format described in <<SP800-56Br2>>. See the descriptions of basic, CRT, and prime-factor private key formats in Section 3.2 of <<SP800-56Br2>>.
+The RSA decryptionPrimitive mode capabilities are advertised as JSON objects within the array of 'capabilities' as part of the 'capability_exchange' element of the ACVP JSON registration message. Two properties are supported in the registration. A 'modulo' array supports three modulus values of 2048, 3072, and 4096. For private 'keyFormat', the "standard" and "crt" (Chinese Remainder Theorem) private key formats are supported. "standard" equates to the prime-factor private key format described in <<SP800-56Br2>>. See the descriptions of basic, CRT, and prime-factor private key formats in Section 3.2 of <<SP800-56Br2>>.
 
 When testing the "standard"/prime-factor private key format, a ciphertext (ct), along with private key p, q and d component values are provided, see <<SP800-56Br2>>, Section 7.1.2.2 for details. If an IUT supports the basic private key format, the p and q values provided by the "standard"/prime-factor testing can be multiplied to produce the needed n value.  When testing for the Chinese Remainder Theorem private key format, a ciphertext (ct), the p, q, n, dmp1 (dP), dmq1 (dQ), and iqmp (qInv) values are provided, see <<SP800-56Br2>>, Section 7.1.2.3 for details. 
 See the ACVP specification for details on the registration message.
@@ -41,12 +41,11 @@ An example registration is the following
    "algorithm": "RSA",
    "mode": "decryptionPrimitive",
    "revision": "Sp800-56Br2",
-   "isSample": true,
    "keyFormat": [
      "standard",
      "crt"
    ],
-   "modulus": [
+   "modulo": [
      2048,
      3072,
      4096

diff --git a/src/rsa/sections/05-sigprim-capabilities.adoc b/src/rsa/sections/05-sigprim-capabilities.adoc
@@ -36,7 +36,7 @@ The following RSA / SignaturePrimitive / 2.0 capabilities *MAY* be advertised by
 |===
 | JSON value | Description | JSON type | Valid values
 
-| modulo | supported RSA modulo for signature generation - see <<FIPS186-4>>, Section 5 | array of integer | any of the supported modulo sizes {2048, 3072, 4096}
+| modulo | supported RSA moduli for signature generation - see <<FIPS186-4>>, Section 5 | array of integer | any of the supported modulus sizes {2048, 3072, 4096}
 | keyFormat | The format by which the client expects the private key to be communicated. Standard refers to the default p, q, d values. Chinese Remainder Theorem uses decomposed values for optimized decryption p, q, dmp1, dmq1, iqmp | array of string | "standard", "crt"
 | pubExpMode | Whether the IUT can handle a random or fixed public exponent | string | "random", "fixed"
 | fixedPubExp | The fixed public exponent e | hex | Any value supported by <<FIPS186-4>>: 65537 - 2^256-1, odd
@@ -50,14 +50,13 @@ The following is an example of the registration
     "algorithm": "RSA",
     "mode": "signaturePrimitive",
     "revision": "2.0",
-    "isSample": true,
     "pubExpMode": "fixed",
     "fixedPubExp": "010001"
     "keyFormat": [
         "standard",
         "crt"
     ],
-    "modulus": [
+    "modulo": [
         2048,
         3072,
         4096

diff --git a/src/rsa/sections/06-decprim-test-vectors.adoc b/src/rsa/sections/06-decprim-test-vectors.adoc
@@ -119,7 +119,7 @@ Here is an abbreviated yet fully constructed example of the prompt
         "mode": "DecryptionPrimitive",
         "revision": "Sp800-56Br2",
         "isSample": false,
-        "testGroups": [
+        "testGroups":
         {
             "tgId": 1,
             "modulo": 2048,

diff --git a/src/rsa/sections/06-sigprim-test-vectors.adoc b/src/rsa/sections/06-sigprim-test-vectors.adoc
@@ -125,7 +125,7 @@ Here is an abbreviated yet fully constructed example of the prompt
         "mode": "signaturePrimitive",
         "revision": "2.0",
         "isSample": false,
-        "testGroups": [
+        "testGroups":
         {
             "tgId": 1,
             "modulo": 2048,