Skip to content

Commit 2b2d60f

Browse files
authored
Changes required for new TLSConfiguration init (#63)
1 parent f97086f commit 2b2d60f

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

.dockerignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.build
2+
.git

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ let package = Package(
1111
dependencies: [
1212
.package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
1313
.package(url: "https://github.com/apple/swift-nio.git", from: "2.21.0"),
14-
.package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.10.0"),
14+
.package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.14.0"),
1515
.package(url: "https://github.com/apple/swift-nio-transport-services.git", from: "1.6.0"),
1616
],
1717
targets: [

Sources/MQTTNIO/MQTTConnection.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ final class MQTTConnection {
110110
case .niossl(let config):
111111
tlsConfiguration = config
112112
default:
113-
tlsConfiguration = TLSConfiguration.forClient()
113+
tlsConfiguration = TLSConfiguration.makeClientConfiguration()
114114
}
115115
let sslContext = try NIOSSLContext(configuration: tlsConfiguration)
116116
let tlsProvider = try NIOSSLClientTLSProvider<ClientBootstrap>(context: sslContext, serverHostname: serverName)

Tests/MQTTNIOTests/MQTTNIOTests.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -489,11 +489,11 @@ final class MQTTNIOTests: XCTestCase {
489489
case .success(let config):
490490
switch config {
491491
case .niossl(let config):
492-
return .niossl(TLSConfiguration.forClient(
493-
trustRoots: withTrustRoots == true ? (config.trustRoots ?? .default) : .default,
494-
certificateChain: withClientKey ? config.certificateChain : [],
495-
privateKey: withClientKey ? config.privateKey : nil
496-
))
492+
var tlsConfig = TLSConfiguration.makeClientConfiguration()
493+
tlsConfig.trustRoots = withTrustRoots == true ? (config.trustRoots ?? .default) : .default
494+
tlsConfig.certificateChain = withClientKey ? config.certificateChain : []
495+
tlsConfig.privateKey = withClientKey ? config.privateKey : nil
496+
return .niossl(tlsConfig)
497497
#if !os(Linux)
498498
case .ts(let config):
499499
return .ts(TSTLSConfiguration(

0 commit comments

Comments
 (0)