tests: PivSession

fix tests with auth
add complex pin and puk

Author: DennisDyallo

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

@@ -23,7 +23,6 @@ namespace Yubico.YubiKey.Piv
     [Trait(TraitTypes.Category, TestCategories.Simple)]
     public class PinNoCollectorTests : PivSessionIntegrationTestBase
     {
-
         [Theory]
         [InlineData(StandardTestDevice.Fw5)]
         public void VerifyPin_Sign_Succeeds(
@@ -54,7 +53,7 @@ public void VerifyPin_WrongPin_ReturnsFalse(
 
             // Act
             var isValid = Session.TryVerifyPin(pin, out var retriesRemaining);
-            
+
             // Assert
             Assert.False(isValid);
             _ = Assert.NotNull(retriesRemaining);
@@ -94,24 +93,22 @@ public void ChangePuk_Succeeds(
         {
             // Arrange
             TestDeviceType = testDeviceType;
-            var newPuk = "gjH@5K!8"u8.ToArray();
-            var newPin = "1@$#5s!8"u8.ToArray();
 
             using (var pivSession = GetSession(authenticate: false))
             {
                 pivSession.ResetApplication();
-                var isValid = pivSession.TryChangePuk(DefaultPuk, newPuk, out var retriesRemaining);
+                var isValid = pivSession.TryChangePuk(DefaultPuk, ComplexPuk, out var retriesRemaining);
                 Assert.True(isValid);
                 Assert.Null(retriesRemaining);
             }
 
             using (var pivSession = GetSession(authenticate: false))
             {
-                var isValid = pivSession.TryResetPin(newPuk, newPin, out var retriesRemaining);
+                var isValid = pivSession.TryResetPin(ComplexPuk, ComplexPin, out var retriesRemaining);
                 Assert.True(isValid);
                 Assert.Null(retriesRemaining);
 
-                isValid = pivSession.TryVerifyPin(newPin, out retriesRemaining);
+                isValid = pivSession.TryVerifyPin(ComplexPin, out retriesRemaining);
                 Assert.True(isValid);
                 Assert.Null(retriesRemaining);
 
@@ -135,27 +132,25 @@ public void ChangeRetryCounts_Succeeds(
                 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
                 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08
             };
-            var newPuk = "gjH@5K!8"u8.ToArray();
-            var newPin = "1@$#5s!8"u8.ToArray();
-            
+
             using (var pivSession = GetSession(authenticate: false))
             {
-                var isValid = pivSession.TryChangePin(DefaultPin, newPin, out var retriesRemaining);
+                var isValid = pivSession.TryChangePin(DefaultPin, ComplexPin, out var retriesRemaining);
                 Assert.True(isValid);
                 Assert.Null(retriesRemaining);
 
-                isValid = pivSession.TryChangePuk(DefaultPuk, newPuk, out retriesRemaining);
+                isValid = pivSession.TryChangePuk(DefaultPuk, ComplexPuk, out retriesRemaining);
                 Assert.Null(retriesRemaining);
                 Assert.True(isValid);
             }
 
             using (var pivSession = GetSession(authenticate: false))
             {
-                var isValid = pivSession.TryVerifyPin(newPin, out var retriesRemaining);
+                var isValid = pivSession.TryVerifyPin(ComplexPin, out var retriesRemaining);
                 Assert.True(isValid);
                 Assert.Null(retriesRemaining);
 
-                isValid = pivSession.TryResetPin(newPuk, DefaultPin, out retriesRemaining);
+                isValid = pivSession.TryResetPin(ComplexPuk, DefaultPin, out retriesRemaining);
                 Assert.True(isValid);
                 Assert.Null(retriesRemaining);
             }
@@ -166,30 +161,31 @@ public void ChangeRetryCounts_Succeeds(
                 Assert.True(isValid);
                 Assert.Null(retriesRemaining);
 
-                isValid = pivSession.TryChangePin(DefaultPin, newPin, out retriesRemaining);
+                isValid = pivSession.TryChangePin(DefaultPin, ComplexPin, out retriesRemaining);
                 Assert.True(isValid);
                 Assert.Null(retriesRemaining);
 
-                isValid = pivSession.TryVerifyPin(newPin, out retriesRemaining);
+                isValid = pivSession.TryVerifyPin(ComplexPin, out retriesRemaining);
                 Assert.Null(retriesRemaining);
                 Assert.True(isValid);
             }
 
             using (var pivSession = GetSession(authenticate: false))
             {
-                var isValid = pivSession.TryChangePinAndPukRetryCounts(mgmtKey, newPin, 7, 8, out var retriesRemaining);
+                var isValid =
+                    pivSession.TryChangePinAndPukRetryCounts(mgmtKey, ComplexPin, 7, 8, out var retriesRemaining);
                 Assert.True(isValid);
                 Assert.Null(retriesRemaining);
 
                 isValid = pivSession.TryVerifyPin(DefaultPin, out retriesRemaining);
                 Assert.True(isValid);
                 Assert.Null(retriesRemaining);
 
-                isValid = pivSession.TryResetPin(DefaultPuk, newPin, out retriesRemaining);
+                isValid = pivSession.TryResetPin(DefaultPuk, ComplexPin, out retriesRemaining);
                 Assert.True(isValid);
                 Assert.Null(retriesRemaining);
 
-                isValid = pivSession.TryChangePin(newPin, DefaultPin, out retriesRemaining);
+                isValid = pivSession.TryChangePin(ComplexPin, DefaultPin, out retriesRemaining);
                 Assert.True(isValid);
                 Assert.Null(retriesRemaining);
             }

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

@@ -24,6 +24,8 @@ public class PivSessionIntegrationTestBase : IDisposable
 {
     public static readonly ReadOnlyMemory<byte> DefaultPin = "123456"u8.ToArray();
     public static readonly ReadOnlyMemory<byte> DefaultPuk = "12345678"u8.ToArray();
+    public static readonly ReadOnlyMemory<byte> ComplexPuk = "gjH@5K!8"u8.ToArray();
+    public static readonly ReadOnlyMemory<byte> ComplexPin = "1@$#5s!8"u8.ToArray();
 
     public static readonly ReadOnlyMemory<byte> DefaultManagementKey = new byte[] // Both Aes and TDes
     {

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

@@ -101,7 +101,7 @@ public void Auth_ThenWrongKey()
             Assert.Equal(ResponseStatus.Success, genPairResponse.Status);
 
             SetKeyFlag(1);
-            TryAuthenticate(true, false);
+            TryAuthenticate(false, false);
             Assert.Equal(AuthenticateManagementKeyResult.SingleAuthenticationFailed,
                 Session.ManagementKeyAuthenticationResult);
 
@@ -139,19 +139,8 @@ public void ChangePuk()
         [Fact]
         public void ResetPin()
         {
-            SetKeyFlag(0);
             var isChanged = Session.TryResetPin();
             Assert.True(isChanged);
-            
-            isChanged = Session.TryChangePuk();
-            Assert.True(isChanged);
-
-            SetKeyFlag(1);
-            isChanged = Session.TryResetPin();
-            Assert.True(isChanged);
-
-            isChanged = Session.TryChangePuk();
-            Assert.True(isChanged);
         }
 
         [Fact]