Add availability guards

apple · Nov 6, 2024 · fda1a2c · fda1a2c
1 parent 0807220
commit fda1a2c
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 0 deletions.
diff --git a/Sources/_CryptoExtras/ECToolbox/BoringSSL/ECToolbox_boring.swift b/Sources/_CryptoExtras/ECToolbox/BoringSSL/ECToolbox_boring.swift
@@ -239,6 +239,7 @@ struct OpenSSLGroup<C: OpenSSLSupportedNISTCurve>: Group {
     }
 }
 
+@available(macOS 10.15, iOS 13.2, tvOS 13.2, watchOS 6.1, *)
 struct OpenSSLHashToCurve<C: OpenSSLSupportedNISTCurve>: HashToGroup {
     typealias H = C.H
     typealias GE = OpenSSLCurvePoint<C>

diff --git a/Sources/_CryptoExtras/ECToolbox/ECToolbox.swift b/Sources/_CryptoExtras/ECToolbox/ECToolbox.swift
@@ -21,6 +21,7 @@ typealias HashToCurveImpl = CoreCryptoHashToCurve
 #else
 typealias SupportedCurveDetailsImpl = OpenSSLSupportedNISTCurve
 typealias GroupImpl = OpenSSLGroup
+@available(macOS 10.15, iOS 13.2, tvOS 13.2, watchOS 6.1, *)
 typealias HashToCurveImpl = OpenSSLHashToCurve
 #endif
 

diff --git a/Sources/_CryptoExtras/H2G/HashToField.swift b/Sources/_CryptoExtras/H2G/HashToField.swift
@@ -26,6 +26,7 @@ enum Hash2FieldErrors: Error {
 }
 
 /// HashToField hashes a byte string msg of arbitrary length into one or more elements of a finite field
+@available(macOS 10.15, iOS 13.2, tvOS 13.2, watchOS 6.1, *)
 struct HashToField<C: SupportedCurveDetailsImpl> {
     static func expandMessageXMD(_ msg: Data, DST: Data, outputByteCount L: Int) throws -> Data {
         typealias H = C.H

diff --git a/Sources/_CryptoExtras/OPRFs/OPRF.swift b/Sources/_CryptoExtras/OPRFs/OPRF.swift
@@ -16,8 +16,10 @@ import Crypto
 
 /// (Verifiable Partly-)Oblivious Pseudorandom Functions
 /// https://cfrg.github.io/draft-irtf-cfrg-voprf/draft-irtf-cfrg-voprf.html
+@available(macOS 10.15, iOS 13.2, tvOS 13.2, watchOS 6.1, *)
 enum OPRF {}
 
+@available(macOS 10.15, iOS 13.2, tvOS 13.2, watchOS 6.1, *)
 extension OPRF {
     enum Errors: Error {
         case invalidProof
@@ -33,6 +35,7 @@ protocol OPRFGroupElement: GroupElement {
     var oprfRepresentation: Data { get }
 }
 
+@available(macOS 10.15, iOS 13.2, tvOS 13.2, watchOS 6.1, *)
 extension OPRF {
     static func oprfVersion(v8CompatibilityMode: Bool) -> String {
         if v8CompatibilityMode {

diff --git a/Sources/_CryptoExtras/OPRFs/OPRFClient.swift b/Sources/_CryptoExtras/OPRFs/OPRFClient.swift
@@ -14,6 +14,7 @@
 import Crypto
 import Foundation
 
+@available(macOS 10.15, iOS 13.2, tvOS 13.2, watchOS 6.1, *)
 extension OPRF {
     struct Client<H2G: HashToGroup> {
         let mode: Mode

diff --git a/Sources/_CryptoExtras/OPRFs/OPRFServer.swift b/Sources/_CryptoExtras/OPRFs/OPRFServer.swift
@@ -14,6 +14,7 @@
 import Foundation
 import Crypto
 
+@available(macOS 10.15, iOS 13.2, tvOS 13.2, watchOS 6.1, *)
 extension OPRF {
     struct Server<H2G: HashToGroup> {
         typealias G = H2G.G

diff --git a/Sources/_CryptoExtras/OPRFs/VOPRFClient.swift b/Sources/_CryptoExtras/OPRFs/VOPRFClient.swift
@@ -14,6 +14,7 @@
 import Crypto
 import Foundation
 
+@available(macOS 10.15, iOS 13.2, tvOS 13.2, watchOS 6.1, *)
 extension OPRF {
     struct VerifiableClient<H2G: HashToGroup> {
         fileprivate let client: OPRF.Client<H2G>

diff --git a/Sources/_CryptoExtras/OPRFs/VOPRFServer.swift b/Sources/_CryptoExtras/OPRFs/VOPRFServer.swift
@@ -14,6 +14,7 @@
 import Foundation
 import Crypto
 
+@available(macOS 10.15, iOS 13.2, tvOS 13.2, watchOS 6.1, *)
 extension OPRF {
     struct VerifiableServer<H2G: HashToGroup> {
         typealias G = H2G.G

diff --git a/Tests/_CryptoExtrasTests/OPRFs/VOPRFAPITests.swift b/Tests/_CryptoExtrasTests/OPRFs/VOPRFAPITests.swift
@@ -32,6 +32,7 @@ extension OPRFSuite {
     }
 }
 
+@available(macOS 13.0, iOS 16.0, tvOS 16.0, watchOS 9.0, *)
 final class VOPRFAPITests: XCTestCase {
     func testVectors() throws {
         try testVectorsVOPRF(suite: .P384_SHA384_VORPF)

diff --git a/Tests/_CryptoExtrasTests/OPRFs/VOPRFPublicAPITests.swift b/Tests/_CryptoExtrasTests/OPRFs/VOPRFPublicAPITests.swift
@@ -15,6 +15,7 @@ import Crypto
 import _CryptoExtras  // NOTE: No @testable import, because we want to test the public API.
 import XCTest
 
+@available(macOS 13.0, iOS 16.0, tvOS 16.0, watchOS 9.0, *)
 final class VOPRFPublicAPITests: XCTestCase {
 
     func testEndToEndVOPRF() throws {