Skip to content

Drop Swift 5.10 #283

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
aryan-25 merged 3 commits into from
Nov 18, 2025
Merged

Drop Swift 5.10 #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b2c18a
Motivation:
aryan-25 Nov 14, 2025
83e7d15
Remove use of deprecated initializer
aryan-25 Nov 14, 2025
af7fbe4
Merge branch 'main' into swift-6.0
aryan-25 Nov 18, 2025
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
1 change: 0 additions & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jobs:
name: Unit tests
uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
with:
linux_5_10_arguments_override: "--explicit-target-dependency-import-check error"
linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
linux_6_1_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
linux_6_2_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ jobs:
name: Unit tests
uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
with:
linux_5_10_arguments_override: "--explicit-target-dependency-import-check error"
linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
linux_6_1_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
linux_6_2_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
Expand Down
58 changes: 42 additions & 16 deletions Benchmarks/Benchmarks/CertificatesBenchmark/VerifierBenchmark.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
//===----------------------------------------------------------------------===//

import Benchmark
import X509
@_spi(FixedExpiryValidationTime) import X509
import Foundation
import Crypto
import SwiftASN1
Expand Down Expand Up @@ -50,7 +50,7 @@ func testTrivialChainBuilding() async -> Int {
let roots = CertificateStore([TestCertificate.ca1])

var verifier = Verifier(rootCertificates: roots) {
RFC5280Policy(validationTime: TestCertificate.referenceTime)
RFC5280Policy(fixedExpiryValidationTime: TestCertificate.referenceTime)
}
let result = await verifier.validate(
leaf: TestCertificate.localhostLeaf,
Expand All @@ -67,7 +67,9 @@ func testTrivialChainBuilding() async -> Int {
func testExtraRootsAreIgnored() async -> Int {
let roots = CertificateStore([TestCertificate.ca1, TestCertificate.ca2])

var verifier = Verifier(rootCertificates: roots) { RFC5280Policy(validationTime: TestCertificate.referenceTime) }
var verifier = Verifier(rootCertificates: roots) {
RFC5280Policy(fixedExpiryValidationTime: TestCertificate.referenceTime)
}
let result = await verifier.validate(
leaf: TestCertificate.localhostLeaf,
intermediates: CertificateStore([TestCertificate.intermediate1])
Expand All @@ -83,7 +85,9 @@ func testExtraRootsAreIgnored() async -> Int {
func testPuttingRootsInTheIntermediariesIsntAProblem() async -> Int {
let roots = CertificateStore([TestCertificate.ca1, TestCertificate.ca2])

var verifier = Verifier(rootCertificates: roots) { RFC5280Policy(validationTime: TestCertificate.referenceTime) }
var verifier = Verifier(rootCertificates: roots) {
RFC5280Policy(fixedExpiryValidationTime: TestCertificate.referenceTime)
}
let result = await verifier.validate(
leaf: TestCertificate.localhostLeaf,
intermediates: CertificateStore([TestCertificate.intermediate1, TestCertificate.ca1, TestCertificate.ca2])
Expand All @@ -99,7 +103,9 @@ func testPuttingRootsInTheIntermediariesIsntAProblem() async -> Int {
func testSupportsCrossSignedRootWithoutTrouble() async -> Int {
let roots = CertificateStore([TestCertificate.ca2])

var verifier = Verifier(rootCertificates: roots) { RFC5280Policy(validationTime: TestCertificate.referenceTime) }
var verifier = Verifier(rootCertificates: roots) {
RFC5280Policy(fixedExpiryValidationTime: TestCertificate.referenceTime)
}
let result = await verifier.validate(
leaf: TestCertificate.localhostLeaf,
intermediates: CertificateStore([TestCertificate.intermediate1, TestCertificate.ca1CrossSignedByCA2])
Expand All @@ -115,7 +121,9 @@ func testSupportsCrossSignedRootWithoutTrouble() async -> Int {
func testBuildsTheShorterPathInTheCaseOfCrossSignedRoots() async -> Int {
let roots = CertificateStore([TestCertificate.ca1, TestCertificate.ca2])

var verifier = Verifier(rootCertificates: roots) { RFC5280Policy(validationTime: TestCertificate.referenceTime) }
var verifier = Verifier(rootCertificates: roots) {
RFC5280Policy(fixedExpiryValidationTime: TestCertificate.referenceTime)
}
let result = await verifier.validate(
leaf: TestCertificate.localhostLeaf,
intermediates: CertificateStore([
Expand All @@ -133,7 +141,9 @@ func testBuildsTheShorterPathInTheCaseOfCrossSignedRoots() async -> Int {
func testPrefersToUseIntermediatesWithSKIThatMatches() async -> Int {
let roots = CertificateStore([TestCertificate.ca1])

var verifier = Verifier(rootCertificates: roots) { RFC5280Policy(validationTime: TestCertificate.referenceTime) }
var verifier = Verifier(rootCertificates: roots) {
RFC5280Policy(fixedExpiryValidationTime: TestCertificate.referenceTime)
}
let result = await verifier.validate(
leaf: TestCertificate.localhostLeaf,
intermediates: CertificateStore([TestCertificate.intermediate1, TestCertificate.intermediate1WithoutSKIAKI])
Expand All @@ -149,7 +159,9 @@ func testPrefersToUseIntermediatesWithSKIThatMatches() async -> Int {
func testPrefersNoSKIToNonMatchingSKI() async -> Int {
let roots = CertificateStore([TestCertificate.ca1])

var verifier = Verifier(rootCertificates: roots) { RFC5280Policy(validationTime: TestCertificate.referenceTime) }
var verifier = Verifier(rootCertificates: roots) {
RFC5280Policy(fixedExpiryValidationTime: TestCertificate.referenceTime)
}
let result = await verifier.validate(
leaf: TestCertificate.localhostLeaf,
intermediates: CertificateStore([
Expand All @@ -167,7 +179,9 @@ func testPrefersNoSKIToNonMatchingSKI() async -> Int {
func testRejectsRootsThatDidNotSignTheCertBeforeThem() async -> Int {
let roots = CertificateStore([TestCertificate.ca1WithAlternativePrivateKey, TestCertificate.ca2])

var verifier = Verifier(rootCertificates: roots) { RFC5280Policy(validationTime: TestCertificate.referenceTime) }
var verifier = Verifier(rootCertificates: roots) {
RFC5280Policy(fixedExpiryValidationTime: TestCertificate.referenceTime)
}
let result = await verifier.validate(
leaf: TestCertificate.localhostLeaf,
intermediates: CertificateStore([
Expand All @@ -186,7 +200,7 @@ func testPolicyFailuresCanFindLongerPaths() async -> Int {

var verifier = Verifier(rootCertificates: roots) {
FailIfCertInChainPolicy(forbiddenCert: TestCertificate.ca1)
RFC5280Policy(validationTime: TestCertificate.referenceTime)
RFC5280Policy(fixedExpiryValidationTime: TestCertificate.referenceTime)
}
let result = await verifier.validate(
leaf: TestCertificate.localhostLeaf,
Expand All @@ -205,7 +219,9 @@ func testPolicyFailuresCanFindLongerPaths() async -> Int {
func testSelfSignedCertsAreTrustedWhenInTrustStore() async -> Int {
let roots = CertificateStore([TestCertificate.ca1, TestCertificate.isolatedSelfSignedCert])

var verifier = Verifier(rootCertificates: roots) { RFC5280Policy(validationTime: TestCertificate.referenceTime) }
var verifier = Verifier(rootCertificates: roots) {
RFC5280Policy(fixedExpiryValidationTime: TestCertificate.referenceTime)
}
let result = await verifier.validate(
leaf: TestCertificate.isolatedSelfSignedCert,
intermediates: CertificateStore([TestCertificate.intermediate1])
Expand Down Expand Up @@ -246,7 +262,9 @@ func testTrustRootsCanBeNonSelfSignedLeaves() async -> Int {
func testTrustRootsCanBeNonSelfSignedIntermediates() async -> Int {
let roots = CertificateStore([TestCertificate.intermediate1])

var verifier = Verifier(rootCertificates: roots) { RFC5280Policy(validationTime: TestCertificate.referenceTime) }
var verifier = Verifier(rootCertificates: roots) {
RFC5280Policy(fixedExpiryValidationTime: TestCertificate.referenceTime)
}
let result = await verifier.validate(
leaf: TestCertificate.localhostLeaf,
intermediates: CertificateStore([TestCertificate.intermediate1])
Expand Down Expand Up @@ -275,7 +293,9 @@ func testWePoliceCriticalExtensionsOnLeafCerts() async -> Int {
TestCertificate.ca1, TestCertificate.isolatedSelfSignedCertWithWeirdCriticalExtension,
])

var verifier = Verifier(rootCertificates: roots) { RFC5280Policy(validationTime: TestCertificate.referenceTime) }
var verifier = Verifier(rootCertificates: roots) {
RFC5280Policy(fixedExpiryValidationTime: TestCertificate.referenceTime)
}
let result = await verifier.validate(
leaf: TestCertificate.isolatedSelfSignedCertWithWeirdCriticalExtension,
intermediates: CertificateStore([TestCertificate.intermediate1])
Expand All @@ -291,7 +311,9 @@ func testWePoliceCriticalExtensionsOnLeafCerts() async -> Int {
func testMissingIntermediateFailsToBuild() async -> Int {
let roots = CertificateStore([TestCertificate.ca1])

var verifier = Verifier(rootCertificates: roots) { RFC5280Policy(validationTime: TestCertificate.referenceTime) }
var verifier = Verifier(rootCertificates: roots) {
RFC5280Policy(fixedExpiryValidationTime: TestCertificate.referenceTime)
}
let result = await verifier.validate(
leaf: TestCertificate.localhostLeaf,
intermediates: CertificateStore([])
Expand All @@ -307,7 +329,9 @@ func testMissingIntermediateFailsToBuild() async -> Int {
func testSelfSignedCertsAreRejectedWhenNotInTheTrustStore() async -> Int {
let roots = CertificateStore([TestCertificate.ca1])

var verifier = Verifier(rootCertificates: roots) { RFC5280Policy(validationTime: TestCertificate.referenceTime) }
var verifier = Verifier(rootCertificates: roots) {
RFC5280Policy(fixedExpiryValidationTime: TestCertificate.referenceTime)
}
let result = await verifier.validate(
leaf: TestCertificate.isolatedSelfSignedCert,
intermediates: CertificateStore([TestCertificate.intermediate1])
Expand All @@ -322,7 +346,9 @@ func testSelfSignedCertsAreRejectedWhenNotInTheTrustStore() async -> Int {
func testMissingRootFailsToBuild() async -> Int {
let roots = CertificateStore([])

var verifier = Verifier(rootCertificates: roots) { RFC5280Policy(validationTime: TestCertificate.referenceTime) }
var verifier = Verifier(rootCertificates: roots) {
RFC5280Policy(fixedExpiryValidationTime: TestCertificate.referenceTime)
}
let result = await verifier.validate(
leaf: TestCertificate.localhostLeaf,
intermediates: CertificateStore([TestCertificate.intermediate1])
Expand Down
2 changes: 1 addition & 1 deletion Benchmarks/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.10
// swift-tools-version:6.0
//===----------------------------------------------------------------------===//
//
// This source file is part of the SwiftCertificates open source project
Expand Down
3 changes: 0 additions & 3 deletions Benchmarks/Thresholds/5.10/CertificatesBenchmark.Parse_WebPKI_Roots_from_DER.p90.json
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions Benchmarks/Thresholds/5.10/CertificatesBenchmark.Parse_WebPKI_Roots_from_PEM_files.p90.json
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions ...rks/Thresholds/5.10/CertificatesBenchmark.Parse_WebPKI_Roots_from_multi_PEM_file.p90.json
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions Benchmarks/Thresholds/5.10/CertificatesBenchmark.TinyArray.append.p90.json
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions Benchmarks/Thresholds/5.10/CertificatesBenchmark.TinyArray_non-allocating_functions.p90.json
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions Benchmarks/Thresholds/5.10/CertificatesBenchmark.Verifier.p90.json
View file
Open in desktop

This file was deleted.

8 changes: 1 addition & 7 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.10
// swift-tools-version:6.0
//===----------------------------------------------------------------------===//
//
// This source file is part of the SwiftCertificates open source project
Expand Down Expand Up @@ -85,12 +85,6 @@ if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
]
}

for target in package.targets {
var settings = target.swiftSettings ?? []
settings.append(.enableExperimentalFeature("StrictConcurrency=complete"))
target.swiftSettings = settings
}

// --- STANDARD CROSS-REPO SETTINGS DO NOT EDIT --- //
for target in package.targets {
switch target.type {
Expand Down
3 changes: 2 additions & 1 deletion Tests/X509Tests/PEMTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,8 @@ final class PEMTests: XCTestCase {
func testRSAPrivateKey() throws {
// generated with "openssl genpkey -algorithm rsa"
let rsaKey = try String(
contentsOf: XCTUnwrap(Bundle.module.url(forResource: "PEMTestRSACertificate", withExtension: "pem"))
contentsOf: XCTUnwrap(Bundle.module.url(forResource: "PEMTestRSACertificate", withExtension: "pem")),
encoding: .ascii
)
let privateKey = try Certificate.PrivateKey(pemEncoded: rsaKey)
guard case .rsa = privateKey.backing else {
Expand Down