tests: misc Scp test changes

Author: DennisDyallo

Yubico.YubiKey/tests/integration/Yubico/YubiKey/Piv/Simple39KeyCollector.cs

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+using System;
+
 namespace Yubico.YubiKey.Piv
 {
     // This KeyCollector class can be used to provide the KeyCollector delegate
@@ -50,20 +52,17 @@ public Simple39KeyCollector(bool setKeyFlagOnChange = false)
 
         public bool Simple39KeyCollectorDelegate(KeyEntryData keyEntryData)
         {
-            if (keyEntryData.IsRetry && RetryFlag == 0)
+            if (keyEntryData.IsRetry && 
+                RetryFlag == 0 && 
+                keyEntryData.RetriesRemaining is not null &&
+                keyEntryData.RetriesRemaining == 1)
             {
-                if (!(keyEntryData.RetriesRemaining is null))
-                {
-                    if (keyEntryData.RetriesRemaining == 1)
-                    {
-                        return false;
-                    }
-                }
+                return false;
             }
 
             bool isChange = false;
-            byte[] currentValue;
-            byte[]? newValue = null;
+            Memory<byte> currentValue;
+            Memory<byte>? newValue = null;
 
             switch (keyEntryData.Request)
             {
@@ -125,52 +124,35 @@ public bool Simple39KeyCollectorDelegate(KeyEntryData keyEntryData)
             {
                 if (KeyFlag != 0)
                 {
-                    currentValue[0] = 0x39;
+                    currentValue.Span[0] = 0x39;
                 }
 
-                keyEntryData.SubmitValue(currentValue);
+                keyEntryData.SubmitValue(currentValue.Span);
             }
             else
             {
                 if (KeyFlag != 0)
                 {
-                    currentValue[0] = 0x39;
+                    currentValue.Span[0] = 0x39;
                 }
                 else
                 {
-                    newValue[0] = 0x39;
+                    newValue.Value.Span[0] = 0x39;
                 }
 
-                keyEntryData.SubmitValues(currentValue, newValue);
+                keyEntryData.SubmitValues(currentValue.Span, newValue.Value.Span);
             }
 
             if (_setKeyFlagOnChange && isChange)
             {
-                if (KeyFlag == 0)
-                {
-                    KeyFlag = 1;
-                }
-                else
-                {
-                    KeyFlag = 1;
-                }
+                KeyFlag = 1;
             }
 
             return true;
         }
 
-        public static byte[] CollectPin() =>
-            new byte[] { 0x31, 0x32, 0x33, 0x34, 0x35, 0x36 };
-
-        public static byte[] CollectPuk() =>
-            new byte[] { 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38 };
-
-        public static byte[] CollectMgmtKey() =>
-            new byte[]
-            {
-                0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-                0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-                0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08
-            };
+        public static Memory<byte> CollectPin() => PivSessionIntegrationTestBase.DefaultPin.ToArray();
+        public static Memory<byte> CollectPuk() => PivSessionIntegrationTestBase.DefaultPuk.ToArray();
+        public static Memory<byte> CollectMgmtKey() => PivSessionIntegrationTestBase.DefaultManagementKey.ToArray();
     }
 }

Yubico.YubiKey/tests/integration/Yubico/YubiKey/Scp/Scp03Tests.cs

@@ -536,7 +536,7 @@ private byte[] GetValidPin(
             byte[] pin;
             if (desiredDeviceType == StandardTestDevice.Fw5Fips)
             {
-                ScpTestUtilities.SetFipsApprovedCredentials(testDevice, YubiKeyApplication.Piv, keyParams);
+                ScpTestUtilities.SetFipsApprovedCredentials(testDevice, keyParams);
                 pin = ScpTestUtilities.FipsPin;
             }
             else

Yubico.YubiKey/tests/integration/Yubico/YubiKey/Scp/ScpTestUtilities.cs

@@ -20,15 +20,15 @@ namespace Yubico.YubiKey.Scp
 {
     public static class ScpTestUtilities
     {
-        public static byte[] FipsPin = {
+        public static readonly byte[] FipsPin = {
             0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88
         };
 
-        public static byte[] FipsPuk = {
+        public static readonly byte[] FipsPuk = {
             0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88
         };
 
-        public static byte[] FipsManagementKey = {
+        public static readonly byte[] FipsManagementKey = {
             0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88,
             0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF, 0x12,
             0x23, 0x34, 0x45, 0x56, 0x67, 0x78, 0x89, 0x9A
@@ -47,18 +47,10 @@ public static void SetFipsApprovedCredentials(PivSession session)
 
         public static void SetFipsApprovedCredentials(
             IYubiKeyDevice device,
-            YubiKeyApplication application,
             ScpKeyParameters parameters)
         {
-            if (application == YubiKeyApplication.Piv)
-            {
-                using var session = new PivSession(device, parameters);
-                SetFipsApprovedCredentials(session);
-
-                return;
-            }
-
-            throw new NotSupportedException();
+            using var session = new PivSession(device, parameters);
+            SetFipsApprovedCredentials(session);
         }
     }
 }