HOTFIX/v1.1.0.28-2

gen-val/json-files/LMS-sigVer-1.0/expectedResults.json

@@ -14,25 +14,25 @@
         },
         {
           "tcId": 2,
-          "testPassed": false
-        },
-        {
-          "tcId": 3,
           "testPassed": true
         },
         {
-          "tcId": 4,
+          "tcId": 3,
           "testPassed": false
         },
         {
-          "tcId": 5,
+          "tcId": 4,
           "testPassed": false
         }
       ]
     },
     {
       "tgId": 2,
       "tests": [
+        {
+          "tcId": 5,
+          "testPassed": true
+        },
         {
           "tcId": 6,
           "testPassed": false
@@ -44,14 +44,6 @@
         {
           "tcId": 8,
           "testPassed": false
-        },
-        {
-          "tcId": 9,
-          "testPassed": true
-        },
-        {
-          "tcId": 10,
-          "testPassed": false
         }
       ]
     }

gen-val/json-files/LMS-sigVer-1.0/validation.json

@@ -33,14 +33,6 @@
     {
       "tcId": 8,
       "result": "passed"
-    },
-    {
-      "tcId": 9,
-      "result": "passed"
-    },
-    {
-      "tcId": 10,
-      "result": "passed"
     }
   ]
 }

gen-val/json-files/RSA-DecryptionPrimitive-Sp800-56Br2/validation.json

@@ -361,30 +361,6 @@
     {
       "tcId": 90,
       "result": "passed"
-    },
-    {
-      "tcId": 91,
-      "result": "passed"
-    },
-    {
-      "tcId": 92,
-      "result": "passed"
-    },
-    {
-      "tcId": 93,
-      "result": "passed"
-    },
-    {
-      "tcId": 94,
-      "result": "passed"
-    },
-    {
-      "tcId": 95,
-      "result": "passed"
-    },
-    {
-      "tcId": 96,
-      "result": "passed"
     }
   ]
 }

gen-val/src/crypto/src/NIST.CVP.ACVTS.Libraries.Crypto.Common/Asymmetric/RSA/Keys/CrtKeyComposer.cs

@@ -33,7 +33,8 @@ public KeyPair ComposeKey(BigInteger e, PrimePair primes)
                     DMQ1 = d % (primes.Q - 1),
                     IQMP = primes.Q.ModularInverse(primes.P),
                     P = primes.P,
-                    Q = primes.Q
+                    Q = primes.Q,
+                    D = d
                 },
                 PubKey = new PublicKey
                 {

gen-val/src/generation/src/NIST.CVP.ACVTS.Libraries.Generation/DSA/v1_0/PqgVer/TestGroupGeneratorPQ.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using NIST.CVP.ACVTS.Libraries.Common.Helpers;
 using NIST.CVP.ACVTS.Libraries.Crypto.Common.Asymmetric.DSA.FFC.Enums;
@@ -31,7 +30,6 @@ public Task<List<TestGroup>> BuildTestGroupsAsync(Parameters parameters)
                             N = capability.N,
                             HashAlg = ShaAttributes.GetHashFunctionFromName(hashAlg),
                             PQTestCaseExpectationProvider = new PQTestCaseExpectationProvider(parameters.IsSample),
-
                             TestType = TEST_TYPE
                         };
 

gen-val/src/generation/src/NIST.CVP.ACVTS.Libraries.Generation/LMS/v1_0/SigVer/TestCaseExpectations/TestCaseExpectationProvider.cs

@@ -17,7 +17,6 @@ public TestCaseExpectationProvider(bool isSample = false)
             {
                     new(LmsSignatureDisposition.None),
                     new(LmsSignatureDisposition.ModifySignature),
-                    new(LmsSignatureDisposition.ModifyKey),
                     new(LmsSignatureDisposition.ModifyMessage),
                     new(LmsSignatureDisposition.ModifyHeader)
                 };

gen-val/src/generation/src/NIST.CVP.ACVTS.Libraries.Generation/LMS/v1_0/SigVer/TestCaseGeneratorAft.cs

@@ -12,7 +12,7 @@ public class TestCaseGeneratorAft : ITestCaseGeneratorAsync<TestGroup, TestCase>
 {
     private readonly IOracle _oracle;
 
-    public int NumberOfTestCasesToGenerate => 5;
+    public int NumberOfTestCasesToGenerate => 4;
 
     public TestCaseGeneratorAft(IOracle oracle)
     {

gen-val/src/generation/src/NIST.CVP.ACVTS.Libraries.Generation/RSA/SP800_56Br2/DpComponent/ContractResolvers/PromptProjectionContractResolver.cs

@@ -24,16 +24,14 @@ protected override Predicate<object> TestCaseSerialization(JsonProperty jsonProp
             var stdIncludeProperties = new[]
             {
                 nameof(TestCase.TestCaseId),
-                nameof(TestCase.CipherText)
-            };
-
-            var aftIncludeProperties = new[]
-            {
+                nameof(TestCase.CipherText),
+                nameof(TestCase.N),
+                nameof(TestCase.E),
                 nameof(TestCase.P),
                 nameof(TestCase.Q),
                 nameof(TestCase.D)
             };
-            
+
             var crtIncludeProperties = new[]
             {
                 nameof(TestCase.Dmp1),
@@ -62,11 +60,6 @@ protected override Predicate<object> TestCaseSerialization(JsonProperty jsonProp
                     return false;
                 }
 
-                if (aftIncludeProperties.Contains(jsonProperty.UnderlyingName, StringComparer.OrdinalIgnoreCase))
-                {
-                    return true;
-                }
-
                 return false;
             };
 

gen-val/src/generation/src/NIST.CVP.ACVTS.Libraries.Generation/RSA/SP800_56Br2/DpComponent/ContractResolvers/ResultProjectionContractResolver.cs

@@ -6,11 +6,7 @@
 namespace NIST.CVP.ACVTS.Libraries.Generation.RSA.Sp800_56Br2.DpComponent.ContractResolvers
 {
     public class ResultProjectionContractResolver : ProjectionContractResolverBase<TestGroup, TestCase>
-    {
-        public ResultProjectionContractResolver()
-        {
-        }
-
+    { 
         protected override Predicate<object> TestGroupSerialization(JsonProperty jsonProperty)
         {
             var includeProperties = new[]
@@ -32,7 +28,8 @@ protected override Predicate<object> TestCaseSerialization(JsonProperty jsonProp
             var includeProperties = new[]
             {
                 nameof(TestCase.TestCaseId),
-                nameof(TestCase.PlainText)
+                nameof(TestCase.PlainText),
+                nameof(TestCase.TestPassed)
             };
 
             if (includeProperties.Contains(jsonProperty.UnderlyingName, StringComparer.OrdinalIgnoreCase))

gen-val/src/generation/src/NIST.CVP.ACVTS.Libraries.Generation/RSA/SP800_56Br2/DpComponent/TestCase.cs

@@ -1,6 +1,5 @@
 using System.Numerics;
 using Newtonsoft.Json;
-using NIST.CVP.ACVTS.Libraries.Crypto.Common.Asymmetric.RSA.Keys;
 using NIST.CVP.ACVTS.Libraries.Generation.Core;
 using NIST.CVP.ACVTS.Libraries.Math;
 
@@ -18,12 +17,13 @@ public class TestCase : ITestCase<TestGroup, TestCase>
 
         [JsonProperty(PropertyName = "pt")]
         public BitString PlainText { get; set; }
-
         public BigInteger Dmp1 { get; set; }
         public BigInteger Dmq1 { get; set; }
         public BigInteger Iqmp { get; set; }
         public BigInteger P { get; set; }
         public BigInteger Q { get; set; }
         public BigInteger D { get; set; }
+        public BigInteger N { get; set; }
+        public BigInteger E { get; set; }
     }
 }

gen-val/src/generation/src/NIST.CVP.ACVTS.Libraries.Generation/RSA/SP800_56Br2/DpComponent/TestCaseExpectations/TestCaseExpectationReason.cs

@@ -0,0 +1,25 @@
+using NIST.CVP.ACVTS.Libraries.Common.Helpers;
+using NIST.CVP.ACVTS.Libraries.Generation.Core;
+using NIST.CVP.ACVTS.Libraries.Oracle.Abstractions.DispositionTypes;
+
+namespace NIST.CVP.ACVTS.Libraries.Generation.RSA.Sp800_56Br2.DpComponent.TestCaseExpectations{
+    public class TestCaseExpectationReason : ITestCaseExpectationReason<RsaDpDisposition>
+    {
+        private readonly RsaDpDisposition _reason;
+
+        public TestCaseExpectationReason(RsaDpDisposition reason)
+        {
+            _reason = reason;
+        }
+
+        public string GetName()
+        {
+            return EnumHelpers.GetEnumDescriptionFromEnum(_reason);
+        }
+
+        public RsaDpDisposition GetReason()
+        {
+            return _reason;
+        }
+    }
+}

gen-val/src/generation/src/NIST.CVP.ACVTS.Libraries.Generation/RSA/SP800_56Br2/DpComponent/TestCaseExpectations/TestCaseExpectationsProvider.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using NIST.CVP.ACVTS.Libraries.Common.ExtensionMethods;
+using NIST.CVP.ACVTS.Libraries.Generation.Core;
+using NIST.CVP.ACVTS.Libraries.Oracle.Abstractions.DispositionTypes;
+
+namespace NIST.CVP.ACVTS.Libraries.Generation.RSA.Sp800_56Br2.DpComponent.TestCaseExpectations
+{
+    public class TestCaseExpectationProvider : ITestCaseExpectationProvider<RsaDpDisposition>
+    {
+        private readonly ConcurrentQueue<TestCaseExpectationReason> _expectationReasons;
+
+        public int ExpectationCount { get; set; }
+        private int NumberOfTestCasesToGenerate { get; set; } = 15;
+
+        public TestCaseExpectationProvider(bool isSample = false)
+        {
+            List<TestCaseExpectationReason> expectationReasons = new List<TestCaseExpectationReason>();
+
+            if (isSample)
+            {
+                NumberOfTestCasesToGenerate -= 5;
+            }
+
+            // We always want 4 failing test cases per group, randomized throughout the test case list
+            expectationReasons.Add(new TestCaseExpectationReason(RsaDpDisposition.CtEqual0));
+            expectationReasons.Add(new TestCaseExpectationReason(RsaDpDisposition.CtEqual1));
+            expectationReasons.Add(new TestCaseExpectationReason(RsaDpDisposition.CtEqualNMinusOne));
+            expectationReasons.Add(new TestCaseExpectationReason(RsaDpDisposition.CtGreaterNMinusOne));
+
+            int i = 4;
+            // Add the remaining passing cases
+            while (i++ < NumberOfTestCasesToGenerate)
+            {
+                expectationReasons.Add(new TestCaseExpectationReason(RsaDpDisposition.None));
+            }
+
+            // Randomize list and stuff it into the Queue for easier iteration/bounds checking
+            _expectationReasons = new ConcurrentQueue<TestCaseExpectationReason>(expectationReasons.Shuffle());
+            ExpectationCount = _expectationReasons.Count;
+        }
+
+        // Is random since it's shuffled in the constructor
+        public ITestCaseExpectationReason<RsaDpDisposition> GetRandomReason()
+        {
+            if (_expectationReasons.TryDequeue(out var reason))
+            {
+                return reason;
+            }
+
+            throw new IndexOutOfRangeException($"No {nameof(_expectationReasons)} remaining to pull");
+        }
+    }
+}

gen-val/src/generation/src/NIST.CVP.ACVTS.Libraries.Generation/RSA/SP800_56Br2/DpComponent/TestCaseGenerator.cs

@@ -1,19 +1,18 @@
 using System;
- using System.Threading.Tasks;
-using NIST.CVP.ACVTS.Libraries.Crypto.Common.Asymmetric.RSA.Enums;
+using System.Threading.Tasks;
 using NIST.CVP.ACVTS.Libraries.Generation.Core;
 using NIST.CVP.ACVTS.Libraries.Generation.Core.Async;
 using NIST.CVP.ACVTS.Libraries.Oracle.Abstractions;
 using NIST.CVP.ACVTS.Libraries.Oracle.Abstractions.ParameterTypes;
+using NIST.CVP.ACVTS.Libraries.Oracle.Abstractions.ResultTypes;
 using NLog;
 
 namespace NIST.CVP.ACVTS.Libraries.Generation.RSA.Sp800_56Br2.DpComponent
 {
     public class TestCaseGenerator : ITestCaseGeneratorWithPrep<TestGroup, TestCase>
     {
         private readonly IOracle _oracle;
-
-        public int NumberOfTestCasesToGenerate { get; private set; } = 16;
+        public int NumberOfTestCasesToGenerate { get; private set; } = 15;
 
         public TestCaseGenerator(IOracle oracle)
         {
@@ -24,43 +23,29 @@ public GenerateResponse PrepareGenerator(TestGroup @group, bool isSample)
         {
             if (isSample)
             {
-                NumberOfTestCasesToGenerate = 8;
+                NumberOfTestCasesToGenerate = 10;
             }
-            
+
             return new GenerateResponse();
         }
 
         public async Task<TestCaseGenerateResponse<TestGroup, TestCase>> GenerateAsync(TestGroup group, bool isSample, int caseNo = 0)
         {
             var testCase = new TestCase();
+            var reason = group.TestCaseExpectationProvider.GetRandomReason();
 
             var rsaDpParams = new RsaDecryptionPrimitiveParameters()
             {
                 Modulo = group.Modulo,
                 Mode = group.KeyMode,
+                Disposition = reason.GetName()
             };
-
+            
             try
             {
                 var dpResult = await _oracle.GetRsaDecryptionPrimitiveSp800B56Br2Async(rsaDpParams);
 
-                testCase.CipherText = dpResult.CipherText;
-                testCase.PlainText = dpResult.PlainText;
-                testCase.TestPassed = dpResult.TestPassed;
-
-                // Set key properties
-                if (group.KeyMode == PrivateKeyModes.Crt)
-                {
-                    testCase.Dmp1 = dpResult.Key.PrivKey.DMP1;
-                    testCase.Dmq1 = dpResult.Key.PrivKey.DMQ1;
-                    testCase.Iqmp = dpResult.Key.PrivKey.IQMP;
-                }
-                else
-                {
-                    testCase.Q = dpResult.Key.PrivKey.Q;
-                    testCase.P = dpResult.Key.PrivKey.P;
-                    testCase.D = dpResult.Key.PrivKey.D;
-                }
+                SetTestCaseData(testCase, dpResult);
             }
             catch (Exception ex)
             {
@@ -70,7 +55,22 @@ public GenerateResponse PrepareGenerator(TestGroup @group, bool isSample)
 
             return new TestCaseGenerateResponse<TestGroup, TestCase>(testCase);
         }
-
+
+        private static void SetTestCaseData(TestCase testCase, RsaDecryptionPrimitiveResult dpResult)
+        {
+            testCase.CipherText = dpResult.CipherText;
+            testCase.PlainText = dpResult.PlainText;
+            testCase.TestPassed = dpResult.TestPassed;
+            testCase.N = dpResult.Key.PubKey.N;
+            testCase.E = dpResult.Key.PubKey.E;
+            testCase.Q = dpResult.Key.PrivKey.Q;
+            testCase.P = dpResult.Key.PrivKey.P;
+            testCase.Dmp1 = dpResult.Key.PrivKey.DMP1;
+            testCase.Dmq1 = dpResult.Key.PrivKey.DMQ1;
+            testCase.Iqmp = dpResult.Key.PrivKey.IQMP;
+            testCase.D = dpResult.Key.PrivKey.D;
+        }
+
         private static ILogger ThisLogger => LogManager.GetCurrentClassLogger();
     }
 }