minor changes

vapor · May 25, 2023 · 8e3a62a · 8e3a62a
1 parent 32b517b
commit 8e3a62a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/...Concurrency/Compression/Compression.swift → ...ebSocketKit/Compression/Compression.swift b/...Concurrency/Compression/Compression.swift → ...ebSocketKit/Compression/Compression.swift
diff --git a/...ncurrency/Compression/Decompression.swift → ...SocketKit/Compression/Decompression.swift b/...ncurrency/Compression/Decompression.swift → ...SocketKit/Compression/Decompression.swift
@@ -3,8 +3,8 @@ import CZlib
 public enum Decompression {
 
     public struct Configuration {
-        /// `deflate` is the main compression algorithm for web-sockets (RFC 7692),
-        /// so for now we only support `deflate`.
+        /// For now we only support `deflate`, because it's the main compression
+        /// algorithm for web-sockets (RFC 7692).
         let algorithm: Compression.Algorithm = .deflate
 
         private init() { }
@@ -22,12 +22,12 @@ public enum Decompression {
 
         private var base: Base
 
-        /// An error occurred when inflating.  Error code is included to aid diagnosis.
+        /// An error occurred when inflating. Error code is included to aid diagnosis.
         public static var inflationError: (Int) -> Self = {
             Self(base: .inflationError($0))
         }
 
-        /// Decoder could not be initialised.  Error code is included to aid diagnosis.
+        /// Decoder could not be initialized. Error code is included to aid diagnosis.
         public static var initializationError: (Int) -> Self = {
             Self(base: .initializationError($0))
         }

diff --git a/Tests/WebSocketKitTests/SSLTestHelpers.swift b/Tests/WebSocketKitTests/SSLTestHelpers.swift
@@ -15,6 +15,7 @@
 
 import Foundation
 @_implementationOnly import CNIOBoringSSL
+
 @testable import NIOSSL
 
 // This function generates a random number suitable for use in an X509
@@ -61,7 +62,7 @@ func randomSerialNumber() -> ASN1_INTEGER {
     return asn1int
 }
 
-func generateRSAPrivateKey() -> UnsafeMutablePointer<EVP_PKEY> {
+func generateRSAPrivateKey() -> OpaquePointer /*<EVP_PKEY>*/ {
     let exponent = CNIOBoringSSL_BN_new()
     defer {
         CNIOBoringSSL_BN_free(exponent)
@@ -91,7 +92,7 @@ func addExtension(x509: OpaquePointer, nid: CInt, value: String) {
     CNIOBoringSSL_X509_EXTENSION_free(ext)
 }
 
-func generateSelfSignedCert(keygenFunction: () -> UnsafeMutablePointer<EVP_PKEY> = generateRSAPrivateKey) -> (NIOSSLCertificate, NIOSSLPrivateKey) {
+func generateSelfSignedCert(keygenFunction: () -> OpaquePointer /*<EVP_PKEY>*/ = generateRSAPrivateKey) -> (NIOSSLCertificate, NIOSSLPrivateKey) {
     let pkey = keygenFunction()
     let x = CNIOBoringSSL_X509_new()!
     CNIOBoringSSL_X509_set_version(x, 2)