addressed PR feedback: tests and reliability of ECParameters

will not default to empty Array on null (ECParameterExtensions) added tests for ECParametersExtensions added tests for ECPrivateKeyParameters added tests for ECPublicKeyParameters
Yubico · Dec 12, 2024 · cd72d24 · cd72d24
1 parent d36823e
commit cd72d24
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Scp/Scp03State.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Scp/Scp03State.cs
@@ -170,9 +170,7 @@ private void PerformExternalAuthenticate(IApduTransform pipeline)
 
             return (macedApdu.Data, newMacChainingValue);
         }
-
 
-        /// <inheritdoc cref="ScpState.Dispose()"/>
         protected override void Dispose(bool disposing)
         {
             if (disposing)

diff --git a/Yubico.YubiKey/tests/unit/Yubico/YubiKey/Cryptography/ECPrivateKeyParametersTests.cs b/Yubico.YubiKey/tests/unit/Yubico/YubiKey/Cryptography/ECPrivateKeyParametersTests.cs
@@ -86,19 +86,19 @@ public void Constructor_WithNullECDsaObject_ThrowsArgumentNullException()
         }
 
         [Theory]
-        [InlineData("nistP256")]
-        [InlineData("nistP384")]
-        [InlineData("nistP521")]
-        public void Constructor_WithDifferentCurves_CreatesValidInstance(string curveName)
+        [InlineData("1.2.840.10045.3.1.7")] // NIST P-256
+        [InlineData("1.3.132.0.34")] // NIST P-384
+        [InlineData("1.3.132.0.35")] // NIST P-512
+        public void Constructor_WithDifferentCurves_CreatesValidInstance(string oid)
         {
             // Arrange
-            using var ecdsa = ECDsa.Create(ECCurve.CreateFromFriendlyName(curveName));
-
+            using var ecdsa = ECDsa.Create(ECCurve.CreateFromOid(Oid.FromOidValue(oid, OidGroup.PublicKeyAlgorithm)));
+            
             // Act
             var privateKeyParams = new ECPrivateKeyParameters(ecdsa);
 
             // Assert
-            Assert.Equal(curveName, privateKeyParams.Parameters.Curve.Oid.FriendlyName);
+            Assert.Equal(oid, privateKeyParams.Parameters.Curve.Oid.Value);
             Assert.NotNull(privateKeyParams.Parameters.D);
         }
     }

diff --git a/Yubico.YubiKey/tests/unit/Yubico/YubiKey/Cryptography/ECPublicKeyParametersTests.cs b/Yubico.YubiKey/tests/unit/Yubico/YubiKey/Cryptography/ECPublicKeyParametersTests.cs
@@ -96,21 +96,22 @@ public void GetBytes_ReturnsCorrectFormat()
         }
 
         [Theory]
-        [InlineData("nistP256")]
-        [InlineData("nistP384")]
-        [InlineData("nistP521")]
-        public void Constructor_WithDifferentCurves_CreatesValidInstance(string curveName)
+        [InlineData("1.2.840.10045.3.1.7")] // NIST P-256
+        [InlineData("1.3.132.0.34")] // NIST P-384
+        [InlineData("1.3.132.0.35")] // NIST P-512
+        public void Constructor_WithDifferentCurves_CreatesValidInstance(string oid)
         {
             // Arrange
-            using var ecdsa = ECDsa.Create(ECCurve.CreateFromFriendlyName(curveName));
-
+            using var ecdsa = ECDsa.Create(ECCurve.CreateFromOid(Oid.FromOidValue(oid, OidGroup.PublicKeyAlgorithm)));
+            
             // Act
             var publicKeyParams = new ECPublicKeyParameters(ecdsa);
 
             // Assert
-            Assert.Equal(curveName, publicKeyParams.Parameters.Curve.Oid.FriendlyName);
+            Assert.Equal(oid, publicKeyParams.Parameters.Curve.Oid.Value);
             Assert.NotNull(publicKeyParams.Parameters.Q.X);
             Assert.NotNull(publicKeyParams.Parameters.Q.Y);
+
         }
 
         [Fact]