Rename SecurityTransforms to AppleCrypto

vcsjones · web-flow · commit 7cff962a8d3b · 2025-09-02T19:12:33.000Z
diff --git a/src/libraries/Common/src/System/Security/Cryptography/ECDiffieHellmanAppleCrypto.cs b/src/libraries/Common/src/System/Security/Cryptography/ECDiffieHellmanAppleCrypto.cs
@@ -8,21 +8,21 @@ namespace System.Security.Cryptography
 {
     internal static partial class ECDiffieHellmanImplementation
     {
-        public sealed partial class ECDiffieHellmanSecurityTransforms : ECDiffieHellman
+        public sealed partial class ECDiffieHellmanAppleCrypto : ECDiffieHellman
         {
-            private readonly EccSecurityTransforms _ecc = new EccSecurityTransforms(typeof(ECDiffieHellman));
+            private readonly EccAppleCrypto _ecc = new EccAppleCrypto(typeof(ECDiffieHellman));
 
-            public ECDiffieHellmanSecurityTransforms()
+            public ECDiffieHellmanAppleCrypto()
             {
                 base.KeySize = 521;
             }
 
-            internal ECDiffieHellmanSecurityTransforms(SafeSecKeyRefHandle publicKey)
+            internal ECDiffieHellmanAppleCrypto(SafeSecKeyRefHandle publicKey)
             {
                 KeySizeValue = _ecc.SetKeyAndGetSize(SecKeyPair.PublicOnly(publicKey));
             }
 
-            internal ECDiffieHellmanSecurityTransforms(SafeSecKeyRefHandle publicKey, SafeSecKeyRefHandle privateKey)
+            internal ECDiffieHellmanAppleCrypto(SafeSecKeyRefHandle publicKey, SafeSecKeyRefHandle privateKey)
             {
                 KeySizeValue = _ecc.SetKeyAndGetSize(SecKeyPair.PublicPrivatePair(publicKey, privateKey));
             }
@@ -177,10 +177,10 @@ public override byte[] DeriveRawSecretAgreement(ECDiffieHellmanPublicKey otherPa
 
             private byte[]? DeriveSecretAgreement(ECDiffieHellmanPublicKey otherPartyPublicKey, IncrementalHash? hasher)
             {
-                if (!(otherPartyPublicKey is ECDiffieHellmanSecurityTransformsPublicKey secTransPubKey))
+                if (!(otherPartyPublicKey is ECDiffieHellmanAppleCryptoPublicKey secTransPubKey))
                 {
                     secTransPubKey =
-                        new ECDiffieHellmanSecurityTransformsPublicKey(otherPartyPublicKey.ExportParameters());
+                        new ECDiffieHellmanAppleCryptoPublicKey(otherPartyPublicKey.ExportParameters());
                 }
 
                 try
@@ -244,16 +244,16 @@ public override byte[] DeriveRawSecretAgreement(ECDiffieHellmanPublicKey otherPa
             }
 
             public override ECDiffieHellmanPublicKey PublicKey =>
-                new ECDiffieHellmanSecurityTransformsPublicKey(ExportParameters(false));
+                new ECDiffieHellmanAppleCryptoPublicKey(ExportParameters(false));
 
-            private sealed class ECDiffieHellmanSecurityTransformsPublicKey : ECDiffieHellmanPublicKey
+            private sealed class ECDiffieHellmanAppleCryptoPublicKey : ECDiffieHellmanPublicKey
             {
-                private readonly EccSecurityTransforms _ecc;
+                private readonly EccAppleCrypto _ecc;
 
-                public ECDiffieHellmanSecurityTransformsPublicKey(ECParameters ecParameters)
+                public ECDiffieHellmanAppleCryptoPublicKey(ECParameters ecParameters)
                 {
                     Debug.Assert(ecParameters.D == null);
-                    _ecc = new EccSecurityTransforms(typeof(ECDiffieHellmanPublicKey));
+                    _ecc = new EccAppleCrypto(typeof(ECDiffieHellmanPublicKey));
                     _ecc.ImportParameters(ecParameters);
                 }
 
diff --git a/src/libraries/Common/src/System/Security/Cryptography/ECDsaAppleCrypto.cs b/src/libraries/Common/src/System/Security/Cryptography/ECDsaAppleCrypto.cs
@@ -9,21 +9,21 @@ namespace System.Security.Cryptography
 {
     internal static partial class ECDsaImplementation
     {
-        public sealed partial class ECDsaSecurityTransforms : ECDsa, IRuntimeAlgorithm
+        public sealed partial class ECDsaAppleCrypto : ECDsa, IRuntimeAlgorithm
         {
-            private readonly EccSecurityTransforms _ecc = new EccSecurityTransforms(typeof(ECDsa));
+            private readonly EccAppleCrypto _ecc = new EccAppleCrypto(typeof(ECDsa));
 
-            public ECDsaSecurityTransforms()
+            public ECDsaAppleCrypto()
             {
                 base.KeySize = 521;
             }
 
-            internal ECDsaSecurityTransforms(SafeSecKeyRefHandle publicKey)
+            internal ECDsaAppleCrypto(SafeSecKeyRefHandle publicKey)
             {
                 KeySizeValue = _ecc.SetKeyAndGetSize(SecKeyPair.PublicOnly(publicKey));
             }
 
-            internal ECDsaSecurityTransforms(SafeSecKeyRefHandle publicKey, SafeSecKeyRefHandle privateKey)
+            internal ECDsaAppleCrypto(SafeSecKeyRefHandle publicKey, SafeSecKeyRefHandle privateKey)
             {
                 KeySizeValue = _ecc.SetKeyAndGetSize(SecKeyPair.PublicPrivatePair(publicKey, privateKey));
             }
diff --git a/src/libraries/Common/src/System/Security/Cryptography/EccAppleCrypto.cs b/src/libraries/Common/src/System/Security/Cryptography/EccAppleCrypto.cs
@@ -10,13 +10,13 @@
 
 namespace System.Security.Cryptography
 {
-    internal sealed partial class EccSecurityTransforms : IDisposable
+    internal sealed partial class EccAppleCrypto : IDisposable
     {
         private SecKeyPair? _keys;
         private bool _disposed;
         private readonly Type _disposedType;
 
-        internal EccSecurityTransforms(Type disposedType)
+        internal EccAppleCrypto(Type disposedType)
         {
             Debug.Assert(disposedType != null);
             _disposedType = disposedType;
diff --git a/src/libraries/Common/src/System/Security/Cryptography/EccAppleCrypto.iOS.cs b/src/libraries/Common/src/System/Security/Cryptography/EccAppleCrypto.iOS.cs
@@ -10,7 +10,7 @@
 
 namespace System.Security.Cryptography
 {
-    internal sealed partial class EccSecurityTransforms
+    internal sealed partial class EccAppleCrypto
     {
 #pragma warning disable IDE0060
         private static ECParameters ExportParametersFromLegacyKey(SecKeyPair keys, bool includePrivateParameters)
diff --git a/src/libraries/Common/src/System/Security/Cryptography/EccAppleCrypto.macOS.cs b/src/libraries/Common/src/System/Security/Cryptography/EccAppleCrypto.macOS.cs
@@ -10,7 +10,7 @@
 
 namespace System.Security.Cryptography
 {
-    internal sealed partial class EccSecurityTransforms
+    internal sealed partial class EccAppleCrypto
     {
         private static ECParameters ExportParametersFromLegacyKey(SecKeyPair keys, bool includePrivateParameters)
         {
diff --git a/src/libraries/Common/src/System/Security/Cryptography/RSAAppleCrypto.cs b/src/libraries/Common/src/System/Security/Cryptography/RSAAppleCrypto.cs
@@ -14,7 +14,7 @@ namespace System.Security.Cryptography
 {
     internal static partial class RSAImplementation
     {
-        public sealed partial class RSASecurityTransforms : RSA, IRuntimeAlgorithm
+        public sealed partial class RSAAppleCrypto : RSA, IRuntimeAlgorithm
         {
             private SecKeyPair? _keys;
 
@@ -24,22 +24,22 @@ public sealed partial class RSASecurityTransforms : RSA, IRuntimeAlgorithm
             // 8192 generated successfully, 8192+8 produced errSecParam.
             private static readonly KeySizes s_legalKeySize = new KeySizes(minSize: 1024, maxSize: 8192, skipSize: 8);
 
-            public RSASecurityTransforms()
+            public RSAAppleCrypto()
                 : this(2048)
             {
             }
 
-            public RSASecurityTransforms(int keySize)
+            public RSAAppleCrypto(int keySize)
             {
                 base.KeySize = keySize;
             }
 
-            internal RSASecurityTransforms(SafeSecKeyRefHandle publicKey)
+            internal RSAAppleCrypto(SafeSecKeyRefHandle publicKey)
             {
                 SetKey(SecKeyPair.PublicOnly(publicKey));
             }
 
-            internal RSASecurityTransforms(SafeSecKeyRefHandle publicKey, SafeSecKeyRefHandle privateKey)
+            internal RSAAppleCrypto(SafeSecKeyRefHandle publicKey, SafeSecKeyRefHandle privateKey)
             {
                 SetKey(SecKeyPair.PublicPrivatePair(publicKey, privateKey));
             }
diff --git a/src/libraries/Common/src/System/Security/Cryptography/RSAAppleCrypto.iOS.cs b/src/libraries/Common/src/System/Security/Cryptography/RSAAppleCrypto.iOS.cs
@@ -15,7 +15,7 @@ namespace System.Security.Cryptography
 {
     internal static partial class RSAImplementation
     {
-        public sealed partial class RSASecurityTransforms
+        public sealed partial class RSAAppleCrypto
         {
 #pragma warning disable IDE0060
             private static RSAParameters ExportParametersFromLegacyKey(SecKeyPair keys, bool includePrivateParameters)
diff --git a/src/libraries/Common/src/System/Security/Cryptography/RSAAppleCrypto.macOS.cs b/src/libraries/Common/src/System/Security/Cryptography/RSAAppleCrypto.macOS.cs
@@ -15,7 +15,7 @@ namespace System.Security.Cryptography
 {
     internal static partial class RSAImplementation
     {
-        public sealed partial class RSASecurityTransforms : RSA
+        public sealed partial class RSAAppleCrypto : RSA
         {
             private static RSAParameters ExportParametersFromLegacyKey(SecKeyPair keys, bool includePrivateParameters)
             {
diff --git a/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj b/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj
@@ -1364,22 +1364,22 @@
              Link="Common\Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs" />
     <Compile Include="$(CommonPath)System\Security\Cryptography\CompositeMLDsaImplementation.NotSupported.cs"
              Link="Common\System\Security\Cryptography\CompositeMLDsaImplementation.NotSupported.cs" />
-    <Compile Include="$(CommonPath)System\Security\Cryptography\EccSecurityTransforms.cs"
-             Link="Common\System\Security\Cryptography\EccSecurityTransforms.cs" />
+    <Compile Include="$(CommonPath)System\Security\Cryptography\EccAppleCrypto.cs"
+             Link="Common\System\Security\Cryptography\EccAppleCrypto.cs" />
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECDiffieHellmanDerivation.cs"
              Link="Common\System\Security\Cryptography\ECDiffieHellmanDerivation.cs" />
-    <Compile Include="$(CommonPath)System\Security\Cryptography\ECDiffieHellmanSecurityTransforms.cs"
-             Link="Common\System\Security\Cryptography\ECDiffieHellmanSecurityTransforms.cs" />
-    <Compile Include="$(CommonPath)System\Security\Cryptography\ECDsaSecurityTransforms.cs"
-             Link="Common\System\Security\Cryptography\ECDsaSecurityTransforms.cs" />
+    <Compile Include="$(CommonPath)System\Security\Cryptography\ECDiffieHellmanAppleCrypto.cs"
+             Link="Common\System\Security\Cryptography\ECDiffieHellmanAppleCrypto.cs" />
+    <Compile Include="$(CommonPath)System\Security\Cryptography\ECDsaAppleCrypto.cs"
+             Link="Common\System\Security\Cryptography\ECDsaAppleCrypto.cs" />
     <Compile Include="$(CommonPath)System\Security\Cryptography\MLDsaImplementation.NotSupported.cs"
              Link="Common\System\Security\Cryptography\MLDsaImplementation.NotSupported.cs" />
     <Compile Include="$(CommonPath)System\Security\Cryptography\MLKemImplementation.cs"
              Link="Common\System\Security\Cryptography\MLKemImplementation.cs" />
     <Compile Include="$(CommonPath)System\Security\Cryptography\MLKemImplementation.NotSupported.cs"
             Link="Common\System\Security\Cryptography\MLKemImplementation.NotSupported.cs" />
-    <Compile Include="$(CommonPath)System\Security\Cryptography\RSASecurityTransforms.cs"
-             Link="Common\System\Security\Cryptography\RSASecurityTransforms.cs" />
+    <Compile Include="$(CommonPath)System\Security\Cryptography\RSAAppleCrypto.cs"
+             Link="Common\System\Security\Cryptography\RSAAppleCrypto.cs" />
     <Compile Include="$(CommonPath)System\Security\Cryptography\SlhDsaImplementation.NotSupported.cs"
              Link="Common\System\Security\Cryptography\SlhDsaImplementation.NotSupported.cs" />
     <Compile Include="$(CommonPath)System\Security\Cryptography\SP800108HmacCounterKdfImplementationManaged.cs"
@@ -1400,8 +1400,8 @@
     <Compile Include="System\Security\Cryptography\CspKeyContainerInfo.NotSupported.cs" />
     <Compile Include="System\Security\Cryptography\DESCryptoServiceProvider.Unix.cs" />
     <Compile Include="System\Security\Cryptography\DesImplementation.Apple.cs" />
-    <Compile Include="System\Security\Cryptography\ECDiffieHellman.Create.SecurityTransforms.cs" />
-    <Compile Include="System\Security\Cryptography\ECDsa.Create.SecurityTransforms.cs" />
+    <Compile Include="System\Security\Cryptography\ECDiffieHellman.Create.AppleCrypto.cs" />
+    <Compile Include="System\Security\Cryptography\ECDsa.Create.AppleCrypto.cs" />
     <Compile Include="System\Security\Cryptography\HashAlgorithmNames.Apple.cs" />
     <Compile Include="System\Security\Cryptography\HashProviderDispenser.Apple.cs" />
     <Compile Include="System\Security\Cryptography\HKDF.Managed.cs" />
@@ -1416,7 +1416,7 @@
     <Compile Include="System\Security\Cryptography\RandomNumberGeneratorImplementation.Apple.cs" />
     <Compile Include="System\Security\Cryptography\RC2CryptoServiceProvider.Unix.cs" />
     <Compile Include="System\Security\Cryptography\RC2Implementation.Apple.cs" />
-    <Compile Include="System\Security\Cryptography\RSA.Create.SecurityTransforms.cs" />
+    <Compile Include="System\Security\Cryptography\RSA.Create.AppleCrypto.cs" />
     <Compile Include="System\Security\Cryptography\RSACryptoServiceProvider.Unix.cs" />
     <Compile Include="System\Security\Cryptography\Shake128.NonWindows.cs" />
     <Compile Include="System\Security\Cryptography\Shake256.NonWindows.cs" />
@@ -1450,10 +1450,10 @@
              Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecKeyRef.macOS.cs" />
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.X509.macOS.cs"
              Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.X509.macOS.cs" />
-    <Compile Include="$(CommonPath)System\Security\Cryptography\EccSecurityTransforms.macOS.cs"
-             Link="Common\System\Security\Cryptography\EccSecurityTransforms.macOS.cs" />
-    <Compile Include="$(CommonPath)System\Security\Cryptography\RSASecurityTransforms.macOS.cs"
-             Link="Common\System\Security\Cryptography\RSASecurityTransforms.macOS.cs" />
+    <Compile Include="$(CommonPath)System\Security\Cryptography\EccAppleCrypto.macOS.cs"
+             Link="Common\System\Security\Cryptography\EccAppleCrypto.macOS.cs" />
+    <Compile Include="$(CommonPath)System\Security\Cryptography\RSAAppleCrypto.macOS.cs"
+             Link="Common\System\Security\Cryptography\RSAAppleCrypto.macOS.cs" />
     <Compile Include="System\Security\Cryptography\AesCcm.NotSupported.cs" />
     <Compile Include="System\Security\Cryptography\DSA.Create.NotSupported.cs" />
     <Compile Include="System\Security\Cryptography\DSACryptoServiceProvider.Unix.cs" />
@@ -1475,10 +1475,10 @@
              Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Keychain.iOS.cs" />
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.X509.iOS.cs"
              Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.X509.iOS.cs" />
-    <Compile Include="$(CommonPath)System\Security\Cryptography\EccSecurityTransforms.iOS.cs"
-             Link="Common\System\Security\Cryptography\EccSecurityTransforms.iOS.cs" />
-    <Compile Include="$(CommonPath)System\Security\Cryptography\RSASecurityTransforms.iOS.cs"
-             Link="Common\System\Security\Cryptography\RSASecurityTransforms.iOS.cs" />
+    <Compile Include="$(CommonPath)System\Security\Cryptography\EccAppleCrypto.iOS.cs"
+             Link="Common\System\Security\Cryptography\EccAppleCrypto.iOS.cs" />
+    <Compile Include="$(CommonPath)System\Security\Cryptography\RSAAppleCrypto.iOS.cs"
+             Link="Common\System\Security\Cryptography\RSAAppleCrypto.iOS.cs" />
     <Compile Include="System\Security\Cryptography\AesCcm.NotSupported.cs" />
     <Compile Include="System\Security\Cryptography\DSA.Create.NotSupported.cs" />
     <Compile Include="System\Security\Cryptography\DSACryptoServiceProvider.NotSupported.cs" />
diff --git a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/ECDiffieHellman.Create.AppleCrypto.cs b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/ECDiffieHellman.Create.AppleCrypto.cs
@@ -7,7 +7,7 @@ public abstract partial class ECDiffieHellman : ECAlgorithm
     {
         public static new partial ECDiffieHellman Create()
         {
-            return new ECDiffieHellmanImplementation.ECDiffieHellmanSecurityTransforms();
+            return new ECDiffieHellmanImplementation.ECDiffieHellmanAppleCrypto();
         }
 
         public static partial ECDiffieHellman Create(ECCurve curve)
diff --git a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/ECDsa.Create.AppleCrypto.cs b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/ECDsa.Create.AppleCrypto.cs
@@ -10,7 +10,7 @@ public partial class ECDsa : ECAlgorithm
         /// </summary>
         public static new partial ECDsa Create()
         {
-            return new ECDsaImplementation.ECDsaSecurityTransforms();
+            return new ECDsaImplementation.ECDsaAppleCrypto();
         }
 
         /// <summary>
diff --git a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/RSA.Create.AppleCrypto.cs b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/RSA.Create.AppleCrypto.cs
@@ -7,7 +7,7 @@ public partial class RSA : AsymmetricAlgorithm
     {
         public static new partial RSA Create()
         {
-            return new RSAImplementation.RSASecurityTransforms();
+            return new RSAImplementation.RSAAppleCrypto();
         }
     }
 }
diff --git a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/RSACryptoServiceProvider.Unix.cs b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/RSACryptoServiceProvider.Unix.cs
@@ -163,7 +163,7 @@ public override int KeySize
             set { _impl.KeySize = value; }
         }
 
-        // RSAOpenSsl is (512, 16384, 8), RSASecurityTransforms is (1024, 16384, 8)
+        // RSAOpenSsl is (512, 16384, 8), RSAAppleCrypto is (1024, 16384, 8)
         // Either way the minimum is lifted off of CAPI's 384, due to platform constraints.
         public override KeySizes[] LegalKeySizes => _impl.LegalKeySizes;
 
diff --git a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/AppleCertificatePal.Keys.macOS.cs b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/AppleCertificatePal.Keys.macOS.cs
@@ -26,7 +26,7 @@ public ICertificatePal CopyWithPrivateKey(DSA privateKey)
 
         public ICertificatePal CopyWithPrivateKey(ECDsa privateKey)
         {
-            var typedKey = privateKey as ECDsaImplementation.ECDsaSecurityTransforms;
+            var typedKey = privateKey as ECDsaImplementation.ECDsaAppleCrypto;
             byte[] ecPrivateKey;
 
             if (typedKey != null)
@@ -61,7 +61,7 @@ public ICertificatePal CopyWithPrivateKey(ECDsa privateKey)
 
         public ICertificatePal CopyWithPrivateKey(ECDiffieHellman privateKey)
         {
-            var typedKey = privateKey as ECDiffieHellmanImplementation.ECDiffieHellmanSecurityTransforms;
+            var typedKey = privateKey as ECDiffieHellmanImplementation.ECDiffieHellmanAppleCrypto;
             byte[] ecPrivateKey;
 
             if (typedKey != null)
@@ -102,7 +102,7 @@ public ICertificatePal CopyWithPrivateKey(MLDsa privateKey)
 
         public ICertificatePal CopyWithPrivateKey(RSA privateKey)
         {
-            var typedKey = privateKey as RSAImplementation.RSASecurityTransforms;
+            var typedKey = privateKey as RSAImplementation.RSAAppleCrypto;
 
             if (typedKey != null)
             {
diff --git a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/AppleCertificatePal.cs b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/AppleCertificatePal.cs
@@ -333,7 +333,7 @@ public byte[] SubjectPublicKeyInfo
             privateKey.SetParentHandle(_certHandle);
             Debug.Assert(!publicKey.IsInvalid);
 
-            return new RSAImplementation.RSASecurityTransforms(publicKey, privateKey);
+            return new RSAImplementation.RSAAppleCrypto(publicKey, privateKey);
         }
 
         public ECDsa? GetECDsaPrivateKey()
@@ -347,7 +347,7 @@ public byte[] SubjectPublicKeyInfo
             privateKey.SetParentHandle(_certHandle);
             Debug.Assert(!publicKey.IsInvalid);
 
-            return new ECDsaImplementation.ECDsaSecurityTransforms(publicKey, privateKey);
+            return new ECDsaImplementation.ECDsaAppleCrypto(publicKey, privateKey);
         }
 
         public ECDiffieHellman? GetECDiffieHellmanPrivateKey()
@@ -361,7 +361,7 @@ public byte[] SubjectPublicKeyInfo
             privateKey.SetParentHandle(_certHandle);
             Debug.Assert(!publicKey.IsInvalid);
 
-            return new ECDiffieHellmanImplementation.ECDiffieHellmanSecurityTransforms(publicKey, privateKey);
+            return new ECDiffieHellmanImplementation.ECDiffieHellmanAppleCrypto(publicKey, privateKey);
         }
 
         public MLDsa? GetMLDsaPrivateKey()
diff --git a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509CertificateLoader.iOS.cs b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509CertificateLoader.iOS.cs
@@ -112,11 +112,11 @@ private static partial Pkcs12Return FromCertAndKey(CertAndKey certAndKey, Import
                 case Oids.Rsa or Oids.RsaPss:
                     return new AsymmetricAlgorithmPkcs12PrivateKey(
                         pkcs8,
-                        static () => new RSAImplementation.RSASecurityTransforms());
+                        static () => new RSAImplementation.RSAAppleCrypto());
                 case Oids.EcPublicKey or Oids.EcDiffieHellman:
                     return new AsymmetricAlgorithmPkcs12PrivateKey(
                         pkcs8,
-                        static () => new ECDsaImplementation.ECDsaSecurityTransforms());
+                        static () => new ECDsaImplementation.ECDsaAppleCrypto());
 
                 default:
                     // No DSA or PQC support on iOS / tvOS.
diff --git a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509CertificateLoader.macOS.cs b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509CertificateLoader.macOS.cs
diff --git a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509Pal.Apple.ECKey.cs b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509Pal.Apple.ECKey.cs
diff --git a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509Pal.iOS.cs b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509Pal.iOS.cs
diff --git a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509Pal.macOS.cs b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509Pal.macOS.cs

Original file line number	Diff line number	Diff line change
`@@ -8,21 +8,21 @@ namespace System.Security.Cryptography`
`8`	`8`	`{`
`9`	`9`	`internal static partial class ECDiffieHellmanImplementation`
`10`	`10`	`{`
`11`		`- public sealed partial class ECDiffieHellmanSecurityTransforms : ECDiffieHellman`
	`11`	`+ public sealed partial class ECDiffieHellmanAppleCrypto : ECDiffieHellman`
`12`	`12`	`{`
`13`		`- private readonly EccSecurityTransforms _ecc = new EccSecurityTransforms(typeof(ECDiffieHellman));`
	`13`	`+ private readonly EccAppleCrypto _ecc = new EccAppleCrypto(typeof(ECDiffieHellman));`
`14`	`14`
`15`		`- public ECDiffieHellmanSecurityTransforms()`
	`15`	`+ public ECDiffieHellmanAppleCrypto()`
`16`	`16`	`{`
`17`	`17`	`base.KeySize = 521;`
`18`	`18`	`}`
`19`	`19`
`20`		`- internal ECDiffieHellmanSecurityTransforms(SafeSecKeyRefHandle publicKey)`
	`20`	`+ internal ECDiffieHellmanAppleCrypto(SafeSecKeyRefHandle publicKey)`
`21`	`21`	`{`
`22`	`22`	`KeySizeValue = _ecc.SetKeyAndGetSize(SecKeyPair.PublicOnly(publicKey));`
`23`	`23`	`}`
`24`	`24`
`25`		`- internal ECDiffieHellmanSecurityTransforms(SafeSecKeyRefHandle publicKey, SafeSecKeyRefHandle privateKey)`
	`25`	`+ internal ECDiffieHellmanAppleCrypto(SafeSecKeyRefHandle publicKey, SafeSecKeyRefHandle privateKey)`
`26`	`26`	`{`
`27`	`27`	`KeySizeValue = _ecc.SetKeyAndGetSize(SecKeyPair.PublicPrivatePair(publicKey, privateKey));`
`28`	`28`	`}`
`@@ -177,10 +177,10 @@ public override byte[] DeriveRawSecretAgreement(ECDiffieHellmanPublicKey otherPa`
`177`	`177`
`178`	`178`	`private byte[]? DeriveSecretAgreement(ECDiffieHellmanPublicKey otherPartyPublicKey, IncrementalHash? hasher)`
`179`	`179`	`{`
`180`		`- if (!(otherPartyPublicKey is ECDiffieHellmanSecurityTransformsPublicKey secTransPubKey))`
	`180`	`+ if (!(otherPartyPublicKey is ECDiffieHellmanAppleCryptoPublicKey secTransPubKey))`
`181`	`181`	`{`
`182`	`182`	`secTransPubKey =`
`183`		`- new ECDiffieHellmanSecurityTransformsPublicKey(otherPartyPublicKey.ExportParameters());`
	`183`	`+ new ECDiffieHellmanAppleCryptoPublicKey(otherPartyPublicKey.ExportParameters());`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`try`
`@@ -244,16 +244,16 @@ public override byte[] DeriveRawSecretAgreement(ECDiffieHellmanPublicKey otherPa`
`244`	`244`	`}`
`245`	`245`
`246`	`246`	`public override ECDiffieHellmanPublicKey PublicKey =>`
`247`		`- new ECDiffieHellmanSecurityTransformsPublicKey(ExportParameters(false));`
	`247`	`+ new ECDiffieHellmanAppleCryptoPublicKey(ExportParameters(false));`
`248`	`248`
`249`		`- private sealed class ECDiffieHellmanSecurityTransformsPublicKey : ECDiffieHellmanPublicKey`
	`249`	`+ private sealed class ECDiffieHellmanAppleCryptoPublicKey : ECDiffieHellmanPublicKey`
`250`	`250`	`{`
`251`		`- private readonly EccSecurityTransforms _ecc;`
	`251`	`+ private readonly EccAppleCrypto _ecc;`
`252`	`252`
`253`		`- public ECDiffieHellmanSecurityTransformsPublicKey(ECParameters ecParameters)`
	`253`	`+ public ECDiffieHellmanAppleCryptoPublicKey(ECParameters ecParameters)`
`254`	`254`	`{`
`255`	`255`	`Debug.Assert(ecParameters.D == null);`
`256`		`- _ecc = new EccSecurityTransforms(typeof(ECDiffieHellmanPublicKey));`
	`256`	`+ _ecc = new EccAppleCrypto(typeof(ECDiffieHellmanPublicKey));`
`257`	`257`	`_ecc.ImportParameters(ecParameters);`
`258`	`258`	`}`
`259`	`259`
Original file line number	Diff line number	Diff line change
`@@ -9,21 +9,21 @@ namespace System.Security.Cryptography`
`9`	`9`	`{`
`10`	`10`	`internal static partial class ECDsaImplementation`
`11`	`11`	`{`
`12`		`- public sealed partial class ECDsaSecurityTransforms : ECDsa, IRuntimeAlgorithm`
	`12`	`+ public sealed partial class ECDsaAppleCrypto : ECDsa, IRuntimeAlgorithm`
`13`	`13`	`{`
`14`		`- private readonly EccSecurityTransforms _ecc = new EccSecurityTransforms(typeof(ECDsa));`
	`14`	`+ private readonly EccAppleCrypto _ecc = new EccAppleCrypto(typeof(ECDsa));`
`15`	`15`
`16`		`- public ECDsaSecurityTransforms()`
	`16`	`+ public ECDsaAppleCrypto()`
`17`	`17`	`{`
`18`	`18`	`base.KeySize = 521;`
`19`	`19`	`}`
`20`	`20`
`21`		`- internal ECDsaSecurityTransforms(SafeSecKeyRefHandle publicKey)`
	`21`	`+ internal ECDsaAppleCrypto(SafeSecKeyRefHandle publicKey)`
`22`	`22`	`{`
`23`	`23`	`KeySizeValue = _ecc.SetKeyAndGetSize(SecKeyPair.PublicOnly(publicKey));`
`24`	`24`	`}`
`25`	`25`
`26`		`- internal ECDsaSecurityTransforms(SafeSecKeyRefHandle publicKey, SafeSecKeyRefHandle privateKey)`
	`26`	`+ internal ECDsaAppleCrypto(SafeSecKeyRefHandle publicKey, SafeSecKeyRefHandle privateKey)`
`27`	`27`	`{`
`28`	`28`	`KeySizeValue = _ecc.SetKeyAndGetSize(SecKeyPair.PublicPrivatePair(publicKey, privateKey));`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,13 +10,13 @@`
`10`	`10`
`11`	`11`	`namespace System.Security.Cryptography`
`12`	`12`	`{`
`13`		`- internal sealed partial class EccSecurityTransforms : IDisposable`
	`13`	`+ internal sealed partial class EccAppleCrypto : IDisposable`
`14`	`14`	`{`
`15`	`15`	`private SecKeyPair? _keys;`
`16`	`16`	`private bool _disposed;`
`17`	`17`	`private readonly Type _disposedType;`
`18`	`18`
`19`		`- internal EccSecurityTransforms(Type disposedType)`
	`19`	`+ internal EccAppleCrypto(Type disposedType)`
`20`	`20`	`{`
`21`	`21`	`Debug.Assert(disposedType != null);`
`22`	`22`	`_disposedType = disposedType;`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`namespace System.Security.Cryptography`
`12`	`12`	`{`
`13`		`- internal sealed partial class EccSecurityTransforms`
	`13`	`+ internal sealed partial class EccAppleCrypto`
`14`	`14`	`{`
`15`	`15`	`#pragma warning disable IDE0060`
`16`	`16`	`private static ECParameters ExportParametersFromLegacyKey(SecKeyPair keys, bool includePrivateParameters)`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ namespace System.Security.Cryptography`
`14`	`14`	`{`
`15`	`15`	`internal static partial class RSAImplementation`
`16`	`16`	`{`
`17`		`- public sealed partial class RSASecurityTransforms : RSA, IRuntimeAlgorithm`
	`17`	`+ public sealed partial class RSAAppleCrypto : RSA, IRuntimeAlgorithm`
`18`	`18`	`{`
`19`	`19`	`private SecKeyPair? _keys;`
`20`	`20`
`@@ -24,22 +24,22 @@ public sealed partial class RSASecurityTransforms : RSA, IRuntimeAlgorithm`
`24`	`24`	`// 8192 generated successfully, 8192+8 produced errSecParam.`
`25`	`25`	`private static readonly KeySizes s_legalKeySize = new KeySizes(minSize: 1024, maxSize: 8192, skipSize: 8);`
`26`	`26`
`27`		`- public RSASecurityTransforms()`
	`27`	`+ public RSAAppleCrypto()`
`28`	`28`	`: this(2048)`
`29`	`29`	`{`
`30`	`30`	`}`
`31`	`31`
`32`		`- public RSASecurityTransforms(int keySize)`
	`32`	`+ public RSAAppleCrypto(int keySize)`
`33`	`33`	`{`
`34`	`34`	`base.KeySize = keySize;`
`35`	`35`	`}`
`36`	`36`
`37`		`- internal RSASecurityTransforms(SafeSecKeyRefHandle publicKey)`
	`37`	`+ internal RSAAppleCrypto(SafeSecKeyRefHandle publicKey)`
`38`	`38`	`{`
`39`	`39`	`SetKey(SecKeyPair.PublicOnly(publicKey));`
`40`	`40`	`}`
`41`	`41`
`42`		`- internal RSASecurityTransforms(SafeSecKeyRefHandle publicKey, SafeSecKeyRefHandle privateKey)`
	`42`	`+ internal RSAAppleCrypto(SafeSecKeyRefHandle publicKey, SafeSecKeyRefHandle privateKey)`
`43`	`43`	`{`
`44`	`44`	`SetKey(SecKeyPair.PublicPrivatePair(publicKey, privateKey));`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ namespace System.Security.Cryptography`
`15`	`15`	`{`
`16`	`16`	`internal static partial class RSAImplementation`
`17`	`17`	`{`
`18`		`- public sealed partial class RSASecurityTransforms`
	`18`	`+ public sealed partial class RSAAppleCrypto`
`19`	`19`	`{`
`20`	`20`	`#pragma warning disable IDE0060`
`21`	`21`	`private static RSAParameters ExportParametersFromLegacyKey(SecKeyPair keys, bool includePrivateParameters)`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public abstract partial class ECDiffieHellman : ECAlgorithm`
`7`	`7`	`{`
`8`	`8`	`public static new partial ECDiffieHellman Create()`
`9`	`9`	`{`
`10`		`- return new ECDiffieHellmanImplementation.ECDiffieHellmanSecurityTransforms();`
	`10`	`+ return new ECDiffieHellmanImplementation.ECDiffieHellmanAppleCrypto();`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`public static partial ECDiffieHellman Create(ECCurve curve)`