Use friendly name in exception if OID value is null. (#37110)

diff --git a/src/libraries/Common/src/System/Security/Cryptography/EccSecurityTransforms.cs b/src/libraries/Common/src/System/Security/Cryptography/EccSecurityTransforms.cs
index 09c8502..301851b 100644 (file)
--- a/src/libraries/Common/src/System/Security/Cryptography/EccSecurityTransforms.cs
+++ b/src/libraries/Common/src/System/Security/Cryptography/EccSecurityTransforms.cs
@@ -60,7 +60,7 @@ namespace System.Security.Cryptography
                     break;
                 default:
                     throw new PlatformNotSupportedException(
-                        SR.Format(SR.Cryptography_CurveNotSupported, curve.Oid.Value));
+                        SR.Format(SR.Cryptography_CurveNotSupported, curve.Oid.Value ?? curve.Oid.FriendlyName));
             }
 
             GenerateKey(keySize);

diff --git a/src/libraries/System.Security.Cryptography.Algorithms/tests/ECDiffieHellmanTests.cs b/src/libraries/System.Security.Cryptography.Algorithms/tests/ECDiffieHellmanTests.cs
index e3abdd0..2fc7649 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Algorithms/tests/ECDiffieHellmanTests.cs
+++ b/src/libraries/System.Security.Cryptography.Algorithms/tests/ECDiffieHellmanTests.cs
@@ -50,6 +50,14 @@ namespace System.Security.Cryptography.EcDiffieHellman.Tests
         }
 
         [Fact]
+        public void Create_InvalidECCurveFriendlyName_ThrowsPlatformNotSupportedException()
+        {
+            ECCurve curve = ECCurve.CreateFromFriendlyName("bad potato");
+            PlatformNotSupportedException pnse = Assert.Throws<PlatformNotSupportedException>(() => ECDiffieHellman.Create(curve));
+            Assert.Contains("'bad potato'", pnse.Message);
+        }
+
+        [Fact]
         public static void Equivalence_Hash()
         {
             using (ECDiffieHellman ecdh = ECDiffieHellmanFactory.Create())

diff --git a/src/libraries/System.Security.Cryptography.Algorithms/tests/ECDsaTests.cs b/src/libraries/System.Security.Cryptography.Algorithms/tests/ECDsaTests.cs
index ad178b4..b42ebf0 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Algorithms/tests/ECDsaTests.cs
+++ b/src/libraries/System.Security.Cryptography.Algorithms/tests/ECDsaTests.cs
@@ -19,6 +19,14 @@ namespace System.Security.Cryptography.Algorithms.Tests
         }
 
         [Fact]
+        public void Create_InvalidECCurveFriendlyName_ThrowsPlatformNotSupportedException()
+        {
+            ECCurve curve = ECCurve.CreateFromFriendlyName("bad potato");
+            PlatformNotSupportedException pnse = Assert.Throws<PlatformNotSupportedException>(() => ECDsa.Create(curve));
+            Assert.Contains("'bad potato'", pnse.Message);
+        }
+
+        [Fact]
         public void NotSupportedBaseMethods_Throw()
         {
             using (var ecdsa = new OverrideAbstractECDsa(ECDsaFactory.Create()))