RELEASE/v1.1.0.32

livebe01 · livebe01 · commit 74779fb5dace · 2023-12-15T13:44:29.000-05:00
diff --git a/gen-val/json-files/RSA-DecryptionPrimitive-Sp800-56Br2/expectedResults.json b/gen-val/json-files/RSA-DecryptionPrimitive-Sp800-56Br2/expectedResults.json
diff --git a/gen-val/json-files/RSA-DecryptionPrimitive-Sp800-56Br2/internalProjection.json b/gen-val/json-files/RSA-DecryptionPrimitive-Sp800-56Br2/internalProjection.json
diff --git a/gen-val/json-files/RSA-DecryptionPrimitive-Sp800-56Br2/prompt.json b/gen-val/json-files/RSA-DecryptionPrimitive-Sp800-56Br2/prompt.json
diff --git a/gen-val/json-files/RSA-DecryptionPrimitive-Sp800-56Br2/registration.json b/gen-val/json-files/RSA-DecryptionPrimitive-Sp800-56Br2/registration.json
@@ -13,5 +13,6 @@
     2048,
     3072,
     4096
-  ]
+  ],
+  "pubExpMode": "random"
 }
diff --git a/gen-val/src/crypto/test/NIST.CVP.ACVTS.Libraries.Crypto.KeyWrap.Tests/KeyWrapAesTests.cs b/gen-val/src/crypto/test/NIST.CVP.ACVTS.Libraries.Crypto.KeyWrap.Tests/KeyWrapAesTests.cs
@@ -84,7 +84,7 @@ public void ShouldInvokeAesEncryptAtLeastTwelveTimes(int payloadSize)
 
             _subject.Encrypt(new BitString(128), payload, false);
 
-            _cipher.Verify(v => v.ProcessPayload(It.IsAny<IModeBlockCipherParameters>()), Times.Exactly(expectedNumberOfInvocations), $"{expectedNumberOfInvocations} invokations expected.");
+            _cipher.Verify(v => v.ProcessPayload(It.IsAny<IModeBlockCipherParameters>()), Times.Exactly(expectedNumberOfInvocations), $"{expectedNumberOfInvocations} invocations expected.");
         }
 
         [Test]
diff --git a/gen-val/src/generation/src/NIST.CVP.ACVTS.Libraries.Generation/EDDSA/v1_0/SigGen/ParameterValidator.cs b/gen-val/src/generation/src/NIST.CVP.ACVTS.Libraries.Generation/EDDSA/v1_0/SigGen/ParameterValidator.cs
@@ -18,7 +18,7 @@ public ParameterValidateResponse Validate(Parameters parameters)
 
             if (!parameters.PreHash && !parameters.Pure)
             {
-                errors.Add("No valid mode chosen");
+                errors.Add("No valid signature generation mode chosen; PreHash or Pure must be true");
             }
 
             return new ParameterValidateResponse(errors);
diff --git a/gen-val/src/generation/src/NIST.CVP.ACVTS.Libraries.Generation/EDDSA/v1_0/SigVer/ParameterValidator.cs b/gen-val/src/generation/src/NIST.CVP.ACVTS.Libraries.Generation/EDDSA/v1_0/SigVer/ParameterValidator.cs
@@ -20,7 +20,7 @@ public ParameterValidateResponse Validate(Parameters parameters)
 
             if (!parameters.PreHash && !parameters.Pure)
             {
-                errors.Add("No valid mode chosen");
+                errors.Add("No valid signature generation mode chosen; PreHash or Pure must be true");
             }
 
             return new ParameterValidateResponse(errors);
diff --git a/gen-val/src/generation/src/NIST.CVP.ACVTS.Libraries.Generation/RSA/SP800_56Br2/DpComponent/ParameterValidator.cs b/gen-val/src/generation/src/NIST.CVP.ACVTS.Libraries.Generation/RSA/SP800_56Br2/DpComponent/ParameterValidator.cs
@@ -18,25 +18,20 @@ public ParameterValidateResponse Validate(Parameters parameters)
             errorResults.AddIfNotNullOrEmpty(ValidateArray(parameters.KeyFormat, VALID_KEY_FORMATS, "keyFormat"));
             errorResults.AddIfNotNullOrEmpty(ValidateArray(parameters.Modulo, VALID_MODULI, "modulo"));
 
-            if (parameters.PublicExponentModes != null)
+            if (parameters.PublicExponentMode == PublicExponentModes.Invalid)
             {
-                foreach (var mode in parameters.PublicExponentModes)
+                errorResults.Add("Invalid or no public exponent mode provided");
+            }
+            
+            if (parameters.PublicExponentMode == PublicExponentModes.Fixed)
+            {
+                if (parameters.PublicExponentValue == null || parameters.PublicExponentValue.BitLength == 0)
+                {
+                    errorResults.Add("No public exponent provided.");
+                }
+                else if (!RsaKeyHelper.IsValidExponent(parameters.PublicExponentValue.ToPositiveBigInteger()))
                 {
-                    if (mode == PublicExponentModes.Invalid)
-                    {
-                        errorResults.Add("Invalid public exponent mode provided");
-                    }
-                    else if (mode== PublicExponentModes.Fixed)
-                    {
-                        if (parameters.PublicExponentValue == null || parameters.PublicExponentValue.BitLength == 0)
-                        {
-                            errorResults.Add("No public exponent provided.");
-                        }
-                        else if (!RsaKeyHelper.IsValidExponent(parameters.PublicExponentValue.ToPositiveBigInteger()))
-                        {
-                            errorResults.Add("Invalid public exponent provided.");
-                        }
-                    }
+                    errorResults.Add("Invalid public exponent provided.");
                 }
             }
 
diff --git a/gen-val/src/generation/src/NIST.CVP.ACVTS.Libraries.Generation/RSA/SP800_56Br2/DpComponent/Parameters.cs b/gen-val/src/generation/src/NIST.CVP.ACVTS.Libraries.Generation/RSA/SP800_56Br2/DpComponent/Parameters.cs
@@ -18,9 +18,9 @@ public class Parameters : IParameters
         
         [JsonProperty(PropertyName = "modulo")] 
         public int[] Modulo { get; set; }
-        
+
         [JsonProperty(PropertyName = "pubExpMode")]
-        public PublicExponentModes[] PublicExponentModes { get; set; }
+        public PublicExponentModes PublicExponentMode { get; set; }
         
         [JsonProperty(PropertyName = "fixedPubExp")]
         public BitString PublicExponentValue = null;
diff --git a/gen-val/src/generation/src/NIST.CVP.ACVTS.Libraries.Generation/RSA/SP800_56Br2/DpComponent/TestGroupGenerator.cs b/gen-val/src/generation/src/NIST.CVP.ACVTS.Libraries.Generation/RSA/SP800_56Br2/DpComponent/TestGroupGenerator.cs
@@ -18,7 +18,7 @@ public Task<List<TestGroup>> BuildTestGroupsAsync(Parameters parameters)
             {
                 foreach (var modulus in parameters.Modulo)
                 {
-                    if (parameters.PublicExponentModes == null)
+                    if (parameters.PublicExponentMode == PublicExponentModes.Random)
                     {
                         groups.Add(new TestGroup
                         {
@@ -32,18 +32,15 @@ public Task<List<TestGroup>> BuildTestGroupsAsync(Parameters parameters)
                     }
                     else
                     {
-                        foreach (var mode in parameters.PublicExponentModes)
+                        groups.Add(new TestGroup
                         {
-                            groups.Add(new TestGroup
-                            {
-                                Modulo = modulus,
-                                KeyMode = format,
-                                TestType = TEST_TYPE,
-                                TestCaseExpectationProvider = new TestCaseExpectationProvider(parameters.IsSample),
-                                PublicExponentMode = mode,
-                                PublicExponent = mode == PublicExponentModes.Fixed ? parameters.PublicExponentValue : null
-                            });
-                        }
+                            Modulo = modulus,
+                            KeyMode = format,
+                            TestType = TEST_TYPE,
+                            TestCaseExpectationProvider = new TestCaseExpectationProvider(parameters.IsSample),
+                            PublicExponentMode = parameters.PublicExponentMode,
+                            PublicExponent = parameters.PublicExponentMode == PublicExponentModes.Fixed ? parameters.PublicExponentValue : null
+                        });
                     }
                 }
             }
diff --git a/gen-val/src/generation/test/NIST.CVP.ACVTS.Libraries.Generation.RSA-DP-SP800-56Br2.IntegrationTests/GenValTests.cs b/gen-val/src/generation/test/NIST.CVP.ACVTS.Libraries.Generation.RSA-DP-SP800-56Br2.IntegrationTests/GenValTests.cs
@@ -28,8 +28,8 @@ protected override string GetTestFileFewTestCases(string folderName)
                 IsSample = true,
                 KeyFormat = new PrivateKeyModes[] { PrivateKeyModes.Standard },
                 Modulo = new [] { 2048 },
-                // PublicExponentModes = new PublicExponentModes[]{ PublicExponentModes.Fixed, PublicExponentModes.Random },
-                // PublicExponentValue = new BitString("010001")
+                PublicExponentMode = PublicExponentModes.Fixed,
+                PublicExponentValue = new BitString("010001")
             };
 
             return CreateRegistration(folderName, p);
@@ -45,7 +45,7 @@ protected override string GetTestFileLotsOfTestCases(string folderName)
                 IsSample = false,
                 KeyFormat = new PrivateKeyModes[] { PrivateKeyModes.Standard, PrivateKeyModes.Crt },
                 Modulo = new [] { 2048, 3072, 4096 },
-                //PublicExponentModes = new PublicExponentModes[]{ PublicExponentModes.Random }
+                PublicExponentMode = PublicExponentModes.Random
             };
 
             return CreateRegistration(folderName, p);
diff --git a/gen-val/src/generation/test/NIST.CVP.ACVTS.Libraries.Generation.Tests/RSA/SP800-56Br2/TestGroupGeneratorTests.cs b/gen-val/src/generation/test/NIST.CVP.ACVTS.Libraries.Generation.Tests/RSA/SP800-56Br2/TestGroupGeneratorTests.cs
@@ -21,7 +21,7 @@ public async Task ShouldCreateCorrectNumberOfTestGroupsByModulus(int[] modulus)
                 IsSample = true,
                 Modulo = modulus,
                 KeyFormat = new [] { PrivateKeyModes.Standard },
-                PublicExponentModes = new PublicExponentModes[] { PublicExponentModes.Random }
+                PublicExponentMode = PublicExponentModes.Random
             };
 
             var tgGen = new TestGroupGenerator();
@@ -41,7 +41,7 @@ public async Task ShouldCreateCorrectNumberOfTestGroupsByKeyFormat(PrivateKeyMod
                 IsSample = true,
                 Modulo = new [] { 2048 },
                 KeyFormat = keyFormats,
-                PublicExponentModes = new PublicExponentModes[] { PublicExponentModes.Random }
+                PublicExponentMode = PublicExponentModes.Random
             };
 
             var tgGen = new TestGroupGenerator();

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,6 @@`
`13`	`13`	`2048,`
`14`	`14`	`3072,`
`15`	`15`	`4096`
`16`		`- ]`
	`16`	`+ ],`
	`17`	`+ "pubExpMode": "random"`
`17`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public void ShouldInvokeAesEncryptAtLeastTwelveTimes(int payloadSize)`
`84`	`84`
`85`	`85`	`_subject.Encrypt(new BitString(128), payload, false);`
`86`	`86`
`87`		`- _cipher.Verify(v => v.ProcessPayload(It.IsAny<IModeBlockCipherParameters>()), Times.Exactly(expectedNumberOfInvocations), $"{expectedNumberOfInvocations} invokations expected.");`
	`87`	`+ _cipher.Verify(v => v.ProcessPayload(It.IsAny<IModeBlockCipherParameters>()), Times.Exactly(expectedNumberOfInvocations), $"{expectedNumberOfInvocations} invocations expected.");`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public ParameterValidateResponse Validate(Parameters parameters)`
`18`	`18`
`19`	`19`	`if (!parameters.PreHash && !parameters.Pure)`
`20`	`20`	`{`
`21`		`- errors.Add("No valid mode chosen");`
	`21`	`+ errors.Add("No valid signature generation mode chosen; PreHash or Pure must be true");`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`return new ParameterValidateResponse(errors);`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public ParameterValidateResponse Validate(Parameters parameters)`
`20`	`20`
`21`	`21`	`if (!parameters.PreHash && !parameters.Pure)`
`22`	`22`	`{`
`23`		`- errors.Add("No valid mode chosen");`
	`23`	`+ errors.Add("No valid signature generation mode chosen; PreHash or Pure must be true");`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`return new ParameterValidateResponse(errors);`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public Task<List<TestGroup>> BuildTestGroupsAsync(Parameters parameters)`
`18`	`18`	`{`
`19`	`19`	`foreach (var modulus in parameters.Modulo)`
`20`	`20`	`{`
`21`		`- if (parameters.PublicExponentModes == null)`
	`21`	`+ if (parameters.PublicExponentMode == PublicExponentModes.Random)`
`22`	`22`	`{`
`23`	`23`	`groups.Add(new TestGroup`
`24`	`24`	`{`
`@@ -32,18 +32,15 @@ public Task<List<TestGroup>> BuildTestGroupsAsync(Parameters parameters)`
`32`	`32`	`}`
`33`	`33`	`else`
`34`	`34`	`{`
`35`		`- foreach (var mode in parameters.PublicExponentModes)`
	`35`	`+ groups.Add(new TestGroup`
`36`	`36`	`{`
`37`		`- groups.Add(new TestGroup`
`38`		`- {`
`39`		`- Modulo = modulus,`
`40`		`- KeyMode = format,`
`41`		`- TestType = TEST_TYPE,`
`42`		`- TestCaseExpectationProvider = new TestCaseExpectationProvider(parameters.IsSample),`
`43`		`- PublicExponentMode = mode,`
`44`		`- PublicExponent = mode == PublicExponentModes.Fixed ? parameters.PublicExponentValue : null`
`45`		`- });`
`46`		`- }`
	`37`	`+ Modulo = modulus,`
	`38`	`+ KeyMode = format,`
	`39`	`+ TestType = TEST_TYPE,`
	`40`	`+ TestCaseExpectationProvider = new TestCaseExpectationProvider(parameters.IsSample),`
	`41`	`+ PublicExponentMode = parameters.PublicExponentMode,`
	`42`	`+ PublicExponent = parameters.PublicExponentMode == PublicExponentModes.Fixed ? parameters.PublicExponentValue : null`
	`43`	`+ });`
`47`	`44`	`}`
`48`	`45`	`}`
`49`	`46`	`}`