瀏覽代碼

Avoid deprecation warnings (#119)

Motivation:

NIOSSL deprecated an init on NIOSSLCertificate. This now warns and
causes some CI jobs to fail as a result.

Modifications:

- Switch to new API

Result:

No warnings, nightly CI passes
George Barnett 4 月之前
父節點
當前提交
28b8e4a1fa
共有 2 個文件被更改,包括 4 次插入6 次删除
  1. 1 1
      Package.swift
  2. 3 5
      Sources/GRPCNIOTransportHTTP2Posix/NIOSSL+GRPC.swift

+ 1 - 1
Package.swift

@@ -51,7 +51,7 @@ let dependencies: [Package.Dependency] = [
   ),
   .package(
     url: "https://github.com/apple/swift-nio-ssl.git",
-    from: "2.31.0"
+    from: "2.33.0"
   ),
   .package(
     url: "https://github.com/apple/swift-nio-extras.git",

+ 3 - 5
Sources/GRPCNIOTransportHTTP2Posix/NIOSSL+GRPC.swift

@@ -54,9 +54,7 @@ extension Sequence<TLSConfig.CertificateSource> {
       case .file(let path, let serializationFormat):
         switch serializationFormat.wrapped {
         case .der:
-          certificateSources.append(
-            .certificate(try NIOSSLCertificate(file: path, format: .der))
-          )
+          try certificateSources.append(.certificate(NIOSSLCertificate.fromDERFile(path)))
 
         case .pem:
           let certificates = try NIOSSLCertificate.fromPEMFile(path).map {
@@ -157,7 +155,7 @@ extension NIOSSLTrustRoots {
           case .pem:
             certificates.append(contentsOf: try NIOSSLCertificate.fromPEMFile(path))
           case .der:
-            certificates.append(try NIOSSLCertificate(file: path, format: .der))
+            certificates.append(try NIOSSLCertificate.fromDERFile(path))
           }
 
         case .transportSpecific(let specific):
@@ -174,7 +172,7 @@ extension NIOSSLTrustRoots {
             case "pem":
               certificates.append(contentsOf: try NIOSSLCertificate.fromPEMFile(path))
             case "der":
-              certificates.append(try NIOSSLCertificate(file: path, format: .der))
+              certificates.append(try NIOSSLCertificate.fromDERFile(path))
             default:
               throw RPCError(
                 code: .invalidArgument,