maintenance: add swift 6 support

beatt83 · Oct 28, 2024 · 420fc33 · 420fc33
1 parent c289a01
commit 420fc33
Show file tree

Hide file tree

Showing 48 changed files with 71 additions and 58 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.8.1
+// swift-tools-version: 5.9.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -112,5 +112,6 @@ let package = Package(
                 "JSONWebToken"
             ]
         ),
-    ]
+    ],
+    swiftLanguageVersions: [.version("6"), .v5]
 )
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 ![Screenshot](jose-swift-logo.png)
 # Jose Swift Library
 
-[![Swift](https://img.shields.io/badge/swift-brightgreen.svg)]() [![iOS](https://img.shields.io/badge/ios-brightgreen.svg)]() [![MacOS](https://img.shields.io/badge/macos-brightgreen.svg)]() [![WatchOS](https://img.shields.io/badge/watchos-brightgreen.svg)]() [![TvOS](https://img.shields.io/badge/tvos-brightgreen.svg)]()
+[![Swift](https://img.shields.io/badge/swift-brightgreen.svg)]() [![Swift6](https://img.shields.io/badge/swift6-brightgreen.svg)]() [![iOS](https://img.shields.io/badge/ios-brightgreen.svg)]() [![MacOS](https://img.shields.io/badge/macos-brightgreen.svg)]() [![WatchOS](https://img.shields.io/badge/watchos-brightgreen.svg)]() [![TvOS](https://img.shields.io/badge/tvos-brightgreen.svg)]()
 
 This library provides comprehensive support for the Jose suite of standards, including JWA (JSON Web Algorithms), JWK (JSON Web Key), JWE (JSON Web Encryption), JWS (JSON Web Signature), and JWT (JSON Web Token). These standards are integral to modern security protocols on the web, offering methods for secure key management, data encryption, signing, and representation of claims among different parties.
 
@@ -168,7 +168,8 @@ Note: JWS Unencoded payload as referenced in the [RFC-7797](https://datatracker.
 
 ## Requirements
 
-- Swift 5.7.1 or later
+- Swift 5.8.1 or later
+- Swift 6 or later
 - iOS 15.0 or later
 - macOS 12.0 or later
 - Mac Catalyst 15.0 or later

diff --git a/Sources/JSONWebAlgorithms/Compression/ContentCompressionAlgorithm.swift b/Sources/JSONWebAlgorithms/Compression/ContentCompressionAlgorithm.swift
@@ -17,7 +17,7 @@
 import Foundation
 
 /// `ContentCompressionAlgorithm` is an enumeration representing the supported content compression algorithms.
-public enum ContentCompressionAlgorithm: String, Codable {
+public enum ContentCompressionAlgorithm: String, Codable, Sendable {
     /// The DEFLATE compression algorithm.
     case deflate = "DEF"
 }

diff --git a/Sources/JSONWebAlgorithms/ContentEncryption/ChaChaPoly/XC20P+ContentEncryption.swift b/Sources/JSONWebAlgorithms/ContentEncryption/ChaChaPoly/XC20P+ContentEncryption.swift
@@ -1,4 +1,4 @@
-import CryptoSwift
+@preconcurrency import CryptoSwift
 import Foundation
 
 /// `XC20P` provides methods to encrypt and decrypt data using the XChaCha20-Poly1305 algorithm.

diff --git a/Sources/JSONWebAlgorithms/ContentEncryption/ContentEncryptionAlgorithm.swift b/Sources/JSONWebAlgorithms/ContentEncryption/ContentEncryptionAlgorithm.swift
@@ -9,7 +9,7 @@
 import Foundation
 
 /// `ContentEncryptionAlgorithm` is an enumeration representing the supported content encryption algorithms.
-public enum ContentEncryptionAlgorithm: String, Codable, Equatable, CaseIterable, Hashable {
+public enum ContentEncryptionAlgorithm: String, Codable, Equatable, CaseIterable, Hashable, Sendable {
     /// AES encryption in CBC mode with an HMAC using SHA-256.
     /// The algorithm uses a 256-bit key and is commonly used for its balance of security and performance.
     case a128CBCHS256 = "A128CBC-HS256"

diff --git a/Sources/JSONWebAlgorithms/CryptoImplementation/AES/AESCBC_SHA.swift b/Sources/JSONWebAlgorithms/CryptoImplementation/AES/AESCBC_SHA.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import CryptoSwift
+@preconcurrency import CryptoSwift
 import CryptoKit
 import Foundation
 import JSONWebKey

diff --git a/Sources/JSONWebAlgorithms/KeyManagement/JWKRepresentable.swift b/Sources/JSONWebAlgorithms/KeyManagement/JWKRepresentable.swift
@@ -7,7 +7,7 @@
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 import CryptoKit
-import CryptoSwift
+@preconcurrency import CryptoSwift
 import Foundation
 import JSONWebKey
 import secp256k1

diff --git a/Sources/JSONWebAlgorithms/KeyManagement/KeyDerivation/PBES2/PBES2SHA.swift b/Sources/JSONWebAlgorithms/KeyManagement/KeyDerivation/PBES2/PBES2SHA.swift
@@ -15,7 +15,7 @@
  */
 
 import CryptoKit
-import CryptoSwift
+@preconcurrency import CryptoSwift
 import Foundation
 import JSONWebKey
 

diff --git a/Sources/JSONWebAlgorithms/KeyManagement/KeyEncryption/RSA/RSA15KeyUnwrap+KeyUnwrapping.swift b/Sources/JSONWebAlgorithms/KeyManagement/KeyEncryption/RSA/RSA15KeyUnwrap+KeyUnwrapping.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import CryptoSwift
+@preconcurrency import CryptoSwift
 import Foundation
 import JSONWebKey
 import Security

diff --git a/...ces/JSONWebAlgorithms/KeyManagement/KeyEncryption/RSA/RSA15KeyWrapper+KeyEncryption.swift b/...ces/JSONWebAlgorithms/KeyManagement/KeyEncryption/RSA/RSA15KeyWrapper+KeyEncryption.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import CryptoSwift
+@preconcurrency import CryptoSwift
 import Foundation
 import JSONWebKey
 import Security

diff --git a/...JSONWebAlgorithms/KeyManagement/KeyEncryption/RSA/RSAOAEP256KeyUnwrap+KeyUnwrapping.swift b/...JSONWebAlgorithms/KeyManagement/KeyEncryption/RSA/RSAOAEP256KeyUnwrap+KeyUnwrapping.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import CryptoSwift
+@preconcurrency import CryptoSwift
 import Foundation
 import JSONWebKey
 import Security

diff --git a/...s/JSONWebAlgorithms/KeyManagement/KeyEncryption/RSA/RSAOAEP256KeyWrap+KeyEncryption.swift b/...s/JSONWebAlgorithms/KeyManagement/KeyEncryption/RSA/RSAOAEP256KeyWrap+KeyEncryption.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import CryptoSwift
+@preconcurrency import CryptoSwift
 import Foundation
 import JSONWebKey
 import Security

diff --git a/...es/JSONWebAlgorithms/KeyManagement/KeyEncryption/RSA/RSAOAEPKeyUnwrap+KeyUnwrapping.swift b/...es/JSONWebAlgorithms/KeyManagement/KeyEncryption/RSA/RSAOAEPKeyUnwrap+KeyUnwrapping.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import CryptoSwift
+@preconcurrency import CryptoSwift
 import Foundation
 import JSONWebKey
 import Security

diff --git a/Sources/JSONWebAlgorithms/KeyManagement/KeyEncryption/RSA/RSAOAEPKeyWrap+KeyEncryption.swift b/Sources/JSONWebAlgorithms/KeyManagement/KeyEncryption/RSA/RSAOAEPKeyWrap+KeyEncryption.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import CryptoSwift
+@preconcurrency import CryptoSwift
 import Foundation
 import JSONWebKey
 import Security

diff --git a/Sources/JSONWebAlgorithms/KeyManagement/KeyEncryptionAlgorithm.swift b/Sources/JSONWebAlgorithms/KeyManagement/KeyEncryptionAlgorithm.swift
@@ -11,7 +11,7 @@ import Foundation
 /// Supported JWE cryptographic algorithms for key management.
 ///
 /// For more information, see [RFC7518 Section 4.1](https://www.rfc-editor.org/rfc/rfc7518#section-4.1)
-public enum KeyManagementAlgorithm: String, Equatable, Codable {
+public enum KeyManagementAlgorithm: String, Sendable, Equatable, Codable {
     /// RSA algorithm with PKCS #1 v1.5 padding.
     case rsa1_5 = "RSA1_5"
 

diff --git a/Sources/JSONWebAlgorithms/KeyManagement/KeyRepresentable/DataKey.swift b/Sources/JSONWebAlgorithms/KeyManagement/KeyRepresentable/DataKey.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import CryptoSwift
+@preconcurrency import CryptoSwift
 import CryptoKit
 import Foundation
 import JSONWebKey

diff --git a/Sources/JSONWebAlgorithms/KeyManagement/KeyRepresentable/KeyRepresentable.swift b/Sources/JSONWebAlgorithms/KeyManagement/KeyRepresentable/KeyRepresentable.swift
@@ -1,5 +1,5 @@
 import CryptoKit
-import CryptoSwift
+@preconcurrency import CryptoSwift
 import Foundation
 import JSONWebKey
 import secp256k1

diff --git a/Sources/JSONWebAlgorithms/KeyManagement/KeyRepresentable/SecKeyExtended.swift b/Sources/JSONWebAlgorithms/KeyManagement/KeyRepresentable/SecKeyExtended.swift
@@ -1,5 +1,5 @@
 import CryptoKit
-import CryptoSwift
+@preconcurrency import CryptoSwift
 import Foundation
 import JSONWebKey
 import Security

diff --git a/Sources/JSONWebAlgorithms/Signatures/EC/Signers/ES256KSigner.swift b/Sources/JSONWebAlgorithms/Signatures/EC/Signers/ES256KSigner.swift
@@ -29,10 +29,17 @@ public struct ES256KSigner: Signer {
         case der
     }
 
+#if swift(>=6.0)
+    /// The output format of the signature.
+    nonisolated(unsafe) public static var outputFormat = ES256KSigner.SignatureFormat.raw
+    /// Indicates whether the bytes R and S are inverted.
+    nonisolated(unsafe) public static var invertedBytesR_S = false
+#else
     /// The output format of the signature.
     public static var outputFormat = ES256KSigner.SignatureFormat.raw
     /// Indicates whether the bytes R and S are inverted.
     public static var invertedBytesR_S = false
+#endif
 
     /// The algorithm used for signing.
     public var algorithm: String { SigningAlgorithm.ES256K.rawValue }

diff --git a/Sources/JSONWebAlgorithms/Signatures/EC/Verifiers/ES256KVerifier.swift b/Sources/JSONWebAlgorithms/Signatures/EC/Verifiers/ES256KVerifier.swift
@@ -21,9 +21,13 @@ import secp256k1
 /// `ES256KVerifier` provides methods to verify signatures using the ES256K algorithm.
 public struct ES256KVerifier: Verifier {
 
+#if swift(>=6.0)
+    /// Indicates whether to use a fail-safe mechanism compatible with Bouncy Castle.
+    nonisolated(unsafe) public static var bouncyCastleFailSafe = false
+#else
     /// Indicates whether to use a fail-safe mechanism compatible with Bouncy Castle.
     public static var bouncyCastleFailSafe = false
-    
+#endif
     /// The algorithm used for verification.
     public var algorithm: String { SigningAlgorithm.ES256K.rawValue }
 

diff --git a/Sources/JSONWebAlgorithms/Signatures/RSA/Helpers/RSA+Security.swift b/Sources/JSONWebAlgorithms/Signatures/RSA/Helpers/RSA+Security.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import CryptoSwift
+@preconcurrency import CryptoSwift
 import Foundation
 import Security
 

diff --git a/Sources/JSONWebAlgorithms/Signatures/RSA/Signers/PS256Signer.swift b/Sources/JSONWebAlgorithms/Signatures/RSA/Signers/PS256Signer.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import CryptoSwift
+@preconcurrency import CryptoSwift
 import Foundation
 import JSONWebKey
 

diff --git a/Sources/JSONWebAlgorithms/Signatures/RSA/Signers/PS384Signer.swift b/Sources/JSONWebAlgorithms/Signatures/RSA/Signers/PS384Signer.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import CryptoSwift
+@preconcurrency import CryptoSwift
 import Foundation
 import JSONWebKey
 

diff --git a/Sources/JSONWebAlgorithms/Signatures/RSA/Signers/PS512Signer.swift b/Sources/JSONWebAlgorithms/Signatures/RSA/Signers/PS512Signer.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import CryptoSwift
+@preconcurrency import CryptoSwift
 import Foundation
 import JSONWebKey
 

diff --git a/Sources/JSONWebAlgorithms/Signatures/RSA/Signers/RS256Signer.swift b/Sources/JSONWebAlgorithms/Signatures/RSA/Signers/RS256Signer.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import CryptoSwift
+@preconcurrency import CryptoSwift
 import Foundation
 import JSONWebKey
 

diff --git a/Sources/JSONWebAlgorithms/Signatures/RSA/Signers/RS384Signer.swift b/Sources/JSONWebAlgorithms/Signatures/RSA/Signers/RS384Signer.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import CryptoSwift
+@preconcurrency import CryptoSwift
 import Foundation
 import JSONWebKey
 

diff --git a/Sources/JSONWebAlgorithms/Signatures/RSA/Signers/RS512Signer.swift b/Sources/JSONWebAlgorithms/Signatures/RSA/Signers/RS512Signer.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import CryptoSwift
+@preconcurrency import CryptoSwift
 import Foundation
 import JSONWebKey
 

diff --git a/Sources/JSONWebAlgorithms/Signatures/RSA/Verifiers/PS256Verifier.swift b/Sources/JSONWebAlgorithms/Signatures/RSA/Verifiers/PS256Verifier.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import CryptoSwift
+@preconcurrency import CryptoSwift
 import Foundation
 import JSONWebKey
 

diff --git a/Sources/JSONWebAlgorithms/Signatures/RSA/Verifiers/PS384Verifier.swift b/Sources/JSONWebAlgorithms/Signatures/RSA/Verifiers/PS384Verifier.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import CryptoSwift
+@preconcurrency import CryptoSwift
 import Foundation
 import JSONWebKey
 

diff --git a/Sources/JSONWebAlgorithms/Signatures/RSA/Verifiers/PS512Verifier.swift b/Sources/JSONWebAlgorithms/Signatures/RSA/Verifiers/PS512Verifier.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import CryptoSwift
+@preconcurrency import CryptoSwift
 import Foundation
 import JSONWebKey
 

diff --git a/Sources/JSONWebAlgorithms/Signatures/RSA/Verifiers/RS256Verifier.swift b/Sources/JSONWebAlgorithms/Signatures/RSA/Verifiers/RS256Verifier.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import CryptoSwift
+@preconcurrency import CryptoSwift
 import Foundation
 import JSONWebKey
 

diff --git a/Sources/JSONWebAlgorithms/Signatures/RSA/Verifiers/RS384Verifier.swift b/Sources/JSONWebAlgorithms/Signatures/RSA/Verifiers/RS384Verifier.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import CryptoSwift
+@preconcurrency import CryptoSwift
 import Foundation
 import JSONWebKey
 

diff --git a/Sources/JSONWebAlgorithms/Signatures/RSA/Verifiers/RS512Verifier.swift b/Sources/JSONWebAlgorithms/Signatures/RSA/Verifiers/RS512Verifier.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import CryptoSwift
+@preconcurrency import CryptoSwift
 import Foundation
 import JSONWebKey
 

diff --git a/Sources/JSONWebAlgorithms/Signatures/SigningAlgorithm.swift b/Sources/JSONWebAlgorithms/Signatures/SigningAlgorithm.swift
@@ -25,7 +25,7 @@ import Foundation
 /// - `PS256`, `PS384`, `PS512`: RSASSA-PSS (RSA Probabilistic Signature Scheme) using SHA-256, SHA-384, and SHA-512 hash functions, respectively, and MGF1 (Mask Generation Function 1).
 /// - `none`: Represents the absence of a digital signature or MAC.
 /// - `invalid`: A placeholder for an invalid or unsupported algorithm, useful for error handling or invalid state representation.
-public enum SigningAlgorithm: String, Codable {
+public enum SigningAlgorithm: String, Codable, Sendable {
     /// HMAC using SHA-256
     case HS256 = "HS256"
 

diff --git a/Sources/JSONWebEncryption/EncryptionModule/Decryptors/JWEDecryptor.swift b/Sources/JSONWebEncryption/EncryptionModule/Decryptors/JWEDecryptor.swift
@@ -19,7 +19,7 @@ import JSONWebAlgorithms
 import JSONWebKey
 
 /// `JWEDecryptor` protocol defines functionality for decrypting JWE objects.
-public protocol JWEDecryptor {
+public protocol JWEDecryptor: Sendable {
     /// Supported key management algorithms by this decryptor.
     var supportedKeyManagementAlgorithms: [KeyManagementAlgorithm] { get }
 
@@ -59,7 +59,7 @@ public protocol JWEDecryptor {
 }
 
 /// `JWEMultiDecryptor` protocol defines functionality for decrypting JWE objects with multiple recipients.
-public protocol JWEMultiDecryptor {
+public protocol JWEMultiDecryptor: Sendable {
     /// Decrypts a JWE object with multiple recipients given various headers and cryptographic components.
     /// - Parameters:
     ///   - protectedHeader: Protected header, conforming to `JWERegisteredFieldsHeader`.

diff --git a/Sources/JSONWebEncryption/EncryptionModule/Encryptors/JWEEncrypter.swift b/Sources/JSONWebEncryption/EncryptionModule/Encryptors/JWEEncrypter.swift
@@ -19,7 +19,7 @@ import JSONWebAlgorithms
 import JSONWebKey
 
 /// JWEEncryptor protocol defines the encryption process for JWE.
-public protocol JWEEncryptor {
+public protocol JWEEncryptor: Sendable {
     /// Supported key management algorithms.
     var supportedKeyManagmentAlgorithms: [KeyManagementAlgorithm] { get }
 
@@ -62,7 +62,7 @@ public protocol JWEEncryptor {
 }
 
 /// JWEMultiEncryptor protocol defines the encryption process for JWE with multiple recipients.
-public protocol JWEMultiEncryptor {
+public protocol JWEMultiEncryptor: Sendable {
     /// Encrypts a payload for multiple recipients.
     /// - Parameters:
     ///   - payload: Data to be encrypted.

diff --git a/Sources/JSONWebEncryption/EncryptionModule/JWE+EncryptionModule.swift b/Sources/JSONWebEncryption/EncryptionModule/JWE+EncryptionModule.swift
@@ -1,5 +1,5 @@
 import Foundation
 
 extension JWE {
-    public static var encryptionModule: JWEEncryptionModule = .default
+    public static let encryptionModule: JWEEncryptionModule = .default
 }