test: updated tests

Author: DennisDyallo

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

@@ -50,7 +50,7 @@ public void KeyAgree_Succeeds(
             }
             else
             {
-                var curve = ECCurve.CreateFromValue(keyType.ToCurveOid()!);
+                var curve = ECCurve.CreateFromValue(keyType.GetCurveOid()!);
                 var ecDsa = ECDsa.Create(curve);
                 peerPrivateKeyEcParameters = ecDsa.ExportParameters(true);
                 var peerPublicKeyEcParameters = ecDsa.ExportParameters(false);

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

@@ -451,6 +451,7 @@ private static Ed25519PublicKeyParameters GetBouncyCastleKeyParameters(IPublicKe
             var bouncyEd25519PublicKey =
                 new Ed25519PublicKeyParameters(
                     ((Curve25519PublicKey)publicKey).PublicPoint.ToArray());
+            
             return bouncyEd25519PublicKey;
         }
 

Yubico.YubiKey/tests/unit/Yubico/YubiKey/Cryptography/RsaPrivateKeyTests.cs

@@ -31,7 +31,7 @@ public void CreateFromPivEncoding_WithValidParameters_CreatesInstance()
         var pivPrivateKeyEncoded = pivPrivateKey.EncodedPrivateKey;
 
         // Act
-        var privateKeyParams = PivEncodingToKey.CreateRSAPrivateKey(pivPrivateKeyEncoded);
+        var privateKeyParams = PivKeyConverter.CreateRSAPrivateKey(pivPrivateKeyEncoded);
         var parameters = privateKeyParams.Parameters;
 
         // Assert

Yubico.YubiKey/tests/unit/Yubico/YubiKey/Cryptography/RsaPublicKeyTests.cs

@@ -19,11 +19,11 @@ public void CreateFromPivEncoding_WithValidParameters_CreatesInstance()
             var pivPublicKeyEncoded = pivPublicKey.PivEncodedPublicKey;
 
             // Act
-            var publicKeyParams = PivEncodingToKey.CreateRSAPublicKey(pivPublicKeyEncoded);
+            var publicKeyParams = PivKeyConverter.CreateRSAPublicKey(pivPublicKeyEncoded);
             var resultParameters = publicKeyParams.Parameters;
 
             // Assert
-            var testKeyParameters = testKey.AsRSA().ExportParameters(false); // Todo how is this working? We're not using the private key, aha, they are probably empty
+            var testKeyParameters = testKey.AsRSA().ExportParameters(false);
             Assert.Equal(testKeyParameters.D, resultParameters.D);
             Assert.Equal(testKeyParameters.DP, resultParameters.DP);
             Assert.Equal(testKeyParameters.DQ, resultParameters.DQ);

Yubico.YubiKey/tests/unit/Yubico/YubiKey/Piv/PivPublicKeyTests.cs

@@ -32,12 +32,61 @@ public void Create_UsingTestKeys_ReturnsPivPublicKey(
         {
             var testKey = TestKeys.GetTestPublicKey(keyType);
             var tlvPublicKey = testKey.AsPivPublicKey().PivEncodedPublicKey;
+            var pivPublicKey = PivPublicKey.Create(tlvPublicKey, keyType.GetPivAlgorithm());
+            Assert.NotNull(pivPublicKey);
 
-            var keyObject = PivPublicKey.Create(tlvPublicKey, keyType.GetPivAlgorithm());
+            if (keyType.IsEllipticCurve())
+            {
+                var pivPublicKeyAsEcc = pivPublicKey as PivEccPublicKey;
+                Assert.NotNull(pivPublicKeyAsEcc);
+                Assert.Equal(testKey.GetPublicPoint(),
+                    pivPublicKeyAsEcc.PublicPoint);
+            }
+            else
+            {
+                var pivPublicKeyAsRsa = pivPublicKey as PivRsaPublicKey;
+                Assert.NotNull(pivPublicKeyAsRsa);
+                Assert.Equal(testKey.GetModulus(),
+                    pivPublicKeyAsRsa.Modulus);
+                Assert.Equal(testKey.GetExponent(),
+                    pivPublicKeyAsRsa.PublicExponent);
+            }
+        }
 
-            Assert.True(keyObject is PivPublicKey);
+        [Theory]
+        [InlineData(KeyType.ECP256)]
+        [InlineData(KeyType.ECP384)]
+        [InlineData(KeyType.ECP521)]
+        [Obsolete("Obsolete")]
+        public void Create_UsingECDsaKeys_ReturnsPivPublicKey(
+            KeyType keyType)
+        {
+            var ecDsa = ECDsa.Create(ECCurve.CreateFromValue(keyType.GetCurveOid()!));
+            var ecParameters = ecDsa.ExportParameters(false);
+
+            var publicPoint = (byte[]) [0x04, .. ecParameters.Q.X!, .. ecParameters.Q.Y!];
+            var pivEccPublicKey = new PivEccPublicKey(publicPoint, keyType.GetPivAlgorithm());
+
+            Assert.Equal(pivEccPublicKey.PublicPoint, publicPoint);
+            Assert.Equal(pivEccPublicKey.Algorithm.GetKeyType(), keyType);
         }
 
+        [Theory]
+        [InlineData(KeyType.RSA2048)]
+        [InlineData(KeyType.RSA3072)]
+        [Obsolete("Obsolete")]
+        public void Create_UsingRSAKeys_ReturnsPivPublicKey(
+            KeyType keyType)
+        {
+            var rsa = RSA.Create(keyType.GetKeySizeBits());
+            var ecParameters = rsa.ExportParameters(false);
+
+            var pivEccPublicKey = new PivRsaPublicKey(ecParameters.Modulus, ecParameters.Exponent);
+
+            Assert.Equal(pivEccPublicKey.Modulus, ecParameters.Modulus);
+            Assert.Equal(pivEccPublicKey.PublicExponent, ecParameters.Exponent);
+            Assert.Equal(pivEccPublicKey.Algorithm.GetKeyType(), keyType);
+        }
 
         [Theory]
         [InlineData(KeyType.RSA1024)]