Simplify platform attribute for AesGcm and ChaCha20Poly1305 (#105547)

Follow-up to #105409, I verified the analyzer works correctly with just having the annotation for iOS.
dotnet · Jul 26, 2024 · 9d7551e · 9d7551e
1 parent eb765b7
commit 9d7551e
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 8 deletions.
diff --git a/...ibraries/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Aead.cs b/...ibraries/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Aead.cs
@@ -32,7 +32,6 @@ private static ref readonly byte GetSwiftRef(ReadOnlySpan<byte> b)
         [UnsupportedOSPlatform("tvos")]
         [SupportedOSPlatform("ios13.0")]
         [SupportedOSPlatform("tvos13.0")]
-        [SupportedOSPlatform("maccatalyst")]
         internal static unsafe void ChaCha20Poly1305Encrypt(
             ReadOnlySpan<byte> key,
             ReadOnlySpan<byte> nonce,
@@ -70,7 +69,6 @@ internal static unsafe void ChaCha20Poly1305Encrypt(
         [UnsupportedOSPlatform("tvos")]
         [SupportedOSPlatform("ios13.0")]
         [SupportedOSPlatform("tvos13.0")]
-        [SupportedOSPlatform("maccatalyst")]
         internal static unsafe void ChaCha20Poly1305Decrypt(
             ReadOnlySpan<byte> key,
             ReadOnlySpan<byte> nonce,
@@ -115,7 +113,6 @@ internal static unsafe void ChaCha20Poly1305Decrypt(
         [UnsupportedOSPlatform("tvos")]
         [SupportedOSPlatform("ios13.0")]
         [SupportedOSPlatform("tvos13.0")]
-        [SupportedOSPlatform("maccatalyst")]
         internal static unsafe void AesGcmEncrypt(
             ReadOnlySpan<byte> key,
             ReadOnlySpan<byte> nonce,
@@ -153,7 +150,6 @@ internal static unsafe void AesGcmEncrypt(
         [UnsupportedOSPlatform("tvos")]
         [SupportedOSPlatform("ios13.0")]
         [SupportedOSPlatform("tvos13.0")]
-        [SupportedOSPlatform("maccatalyst")]
         internal static unsafe void AesGcmDecrypt(
             ReadOnlySpan<byte> key,
             ReadOnlySpan<byte> nonce,

diff --git a/src/libraries/System.Security.Cryptography/ref/System.Security.Cryptography.cs b/src/libraries/System.Security.Cryptography/ref/System.Security.Cryptography.cs
@@ -123,7 +123,6 @@ public override void GenerateKey() { }
     [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("tvos")]
     [System.Runtime.Versioning.SupportedOSPlatform("ios13.0")]
     [System.Runtime.Versioning.SupportedOSPlatform("tvos13.0")]
-    [System.Runtime.Versioning.SupportedOSPlatform("maccatalyst")]
     public sealed partial class AesGcm : System.IDisposable
     {
         [System.ObsoleteAttribute("AesGcm should indicate the required tag size for encryption and decryption. Use a constructor that accepts the tag size.", DiagnosticId="SYSLIB0053", UrlFormat="https://aka.ms/dotnet-warnings/{0}")]
@@ -289,7 +288,6 @@ public AuthenticationTagMismatchException(string? message, System.Exception? inn
     [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("tvos")]
     [System.Runtime.Versioning.SupportedOSPlatform("ios13.0")]
     [System.Runtime.Versioning.SupportedOSPlatform("tvos13.0")]
-    [System.Runtime.Versioning.SupportedOSPlatform("maccatalyst")]
     public sealed partial class ChaCha20Poly1305 : System.IDisposable
     {
         public ChaCha20Poly1305(byte[] key) { }

diff --git a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/AesGcm.cs b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/AesGcm.cs
@@ -12,7 +12,6 @@ namespace System.Security.Cryptography
     [UnsupportedOSPlatform("tvos")]
     [SupportedOSPlatform("ios13.0")]
     [SupportedOSPlatform("tvos13.0")]
-    [SupportedOSPlatform("maccatalyst")]
     public sealed partial class AesGcm : IDisposable
     {
         private const int NonceSize = 12;

diff --git a/...braries/System.Security.Cryptography/src/System/Security/Cryptography/ChaCha20Poly1305.cs b/...braries/System.Security.Cryptography/src/System/Security/Cryptography/ChaCha20Poly1305.cs
@@ -11,7 +11,6 @@ namespace System.Security.Cryptography
     [UnsupportedOSPlatform("tvos")]
     [SupportedOSPlatform("ios13.0")]
     [SupportedOSPlatform("tvos13.0")]
-    [SupportedOSPlatform("maccatalyst")]
     public sealed partial class ChaCha20Poly1305 : IDisposable
     {
         // Per https://tools.ietf.org/html/rfc7539, ChaCha20Poly1305 AEAD requires a 256-bit key and 96-bit nonce,