Skip to content

Remove @available annotations where allowed. #122539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkoritzinsky merged 1 commit into from
Dec 16, 2025
+4 −22
Merged

Remove @available annotations where allowed. #122539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/AesGcm.Apple.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,8 @@ public sealed partial class AesGcm
// CryptoKit only supports 16 byte tags.
private static readonly KeySizes s_tagByteSizes = new KeySizes(16, 16, 1);

// CryptoKit added AES.GCM in macOS 10.15, which is lower than our minimum target for macOS/MacCatalyst. On iOS/tvOS, it was added in 13.0.
public static partial bool IsSupported =>
OperatingSystem.IsMacOS() ||
OperatingSystem.IsMacCatalyst() ||
OperatingSystem.IsIOSVersionAtLeast(13) ||
OperatingSystem.IsTvOSVersionAtLeast(13);
// CryptoKit added AES.GCM in macOS 10.15, and iOS/tvOS in 13.0.
public static partial bool IsSupported => true;

public static partial KeySizes TagByteSizes => s_tagByteSizes;

Expand Down
4 changes: 2 additions & 2 deletions ...s/System.Security.Cryptography/src/System/Security/Cryptography/ChaCha20Poly1305.Apple.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ namespace System.Security.Cryptography
{
public sealed partial class ChaCha20Poly1305
{
// CryptoKit added ChaCha20Poly1305 in macOS 10.15, which is lower than our minimum target for macOS/MacCatalyst. On iOS/tvOS, it was added in 13.0.
public static bool IsSupported => OperatingSystem.IsMacOS() || OperatingSystem.IsMacCatalyst() || OperatingSystem.IsIOSVersionAtLeast(13) || OperatingSystem.IsTvOSVersionAtLeast(13);
// CryptoKit added ChaCha20Poly1305 in macOS 10.15, and iOS/tvOS in 13.0.
public static bool IsSupported => true;
private FixedMemoryKeyBox _keyBox;

[MemberNotNull(nameof(_keyBox))]
Expand Down
14 changes: 0 additions & 14 deletions src/native/libs/System.Security.Cryptography.Native.Apple/pal_swiftbindings.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ protocol SealedBoxProtocol {
) throws where C : DataProtocol, T : DataProtocol
}

@available(iOS 13, tvOS 13, *)
protocol AEADSymmetricAlgorithm {
associatedtype SealedBox : SealedBoxProtocol

Expand All @@ -31,29 +30,22 @@ protocol AEADSymmetricAlgorithm {
static func open(_ sealedBox: SealedBox, using key: SymmetricKey) throws -> Data
}

@available(iOS 13, tvOS 13, *)
extension AES.GCM.Nonce: NonceProtocol {}

@available(iOS 13, tvOS 13, *)
extension AES.GCM.SealedBox: SealedBoxProtocol {
typealias Nonce = AES.GCM.Nonce
}

@available(iOS 13, tvOS 13, *)
extension AES.GCM: AEADSymmetricAlgorithm {}

@available(iOS 13, tvOS 13, *)
extension ChaChaPoly.Nonce: NonceProtocol {}

@available(iOS 13, tvOS 13, *)
extension ChaChaPoly.SealedBox: SealedBoxProtocol {
typealias Nonce = ChaChaPoly.Nonce
}

@available(iOS 13, tvOS 13, *)
extension ChaChaPoly: AEADSymmetricAlgorithm {}

@available(iOS 13, tvOS 13, *)
func encrypt<Algorithm>(
_ algorithm: Algorithm.Type,
key: UnsafeBufferPointer<UInt8>,
Expand All @@ -79,7 +71,6 @@ func encrypt<Algorithm>(
_ = resultTag.copyBytes(to: tag)
}

@available(iOS 13, tvOS 13, *)
func decrypt<Algorithm>(
_ algorithm: Algorithm.Type,
key: UnsafeBufferPointer<UInt8>,
Expand All @@ -101,7 +92,6 @@ func decrypt<Algorithm>(
}

@_silgen_name("AppleCryptoNative_ChaCha20Poly1305Encrypt")
@available(iOS 13, tvOS 13, *)
public func AppleCryptoNative_ChaCha20Poly1305Encrypt(
key: UnsafeBufferPointer<UInt8>,
nonceData: UnsafeBufferPointer<UInt8>,
Expand All @@ -121,7 +111,6 @@ public func AppleCryptoNative_ChaCha20Poly1305Encrypt(
}

@_silgen_name("AppleCryptoNative_ChaCha20Poly1305Decrypt")
@available(iOS 13, tvOS 13, *)
public func AppleCryptoNative_ChaCha20Poly1305Decrypt(
key: UnsafeBufferPointer<UInt8>,
nonceData: UnsafeBufferPointer<UInt8>,
Expand All @@ -141,7 +130,6 @@ public func AppleCryptoNative_ChaCha20Poly1305Decrypt(
}

@_silgen_name("AppleCryptoNative_AesGcmEncrypt")
@available(iOS 13, tvOS 13, *)
public func AppleCryptoNative_AesGcmEncrypt(
key: UnsafeBufferPointer<UInt8>,
nonceData: UnsafeBufferPointer<UInt8>,
Expand All @@ -161,7 +149,6 @@ public func AppleCryptoNative_AesGcmEncrypt(
}

@_silgen_name("AppleCryptoNative_AesGcmDecrypt")
@available(iOS 13, tvOS 13, *)
public func AppleCryptoNative_AesGcmDecrypt(
key: UnsafeBufferPointer<UInt8>,
nonceData: UnsafeBufferPointer<UInt8>,
Expand All @@ -181,7 +168,6 @@ public func AppleCryptoNative_AesGcmDecrypt(
}

@_silgen_name("AppleCryptoNative_IsAuthenticationFailure")
@available(iOS 13, tvOS 13, *)
public func AppleCryptoNative_IsAuthenticationFailure(error: Error) -> Bool {
if let error = error as? CryptoKitError {
switch error {
Expand Down
Loading