Skip to content

Avoid small behaviour change in #550 #551

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
merged 1 commit into from
Jul 15, 2025
Merged

Avoid small behaviour change in #550 #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Sources/NIOSSL/SSLCertificate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public final class NIOSSLCertificate {
/// - parameters:
/// - file: The path to the file to load the certificate from.
/// - format: The format to use to parse the file.
private convenience init(_file file: String, format: NIOSSLSerializationFormats) throws {
internal convenience init(_file file: String, format: NIOSSLSerializationFormats) throws {
let fileObject = try Posix.fopen(file: file, mode: "rb")
defer {
fclose(fileObject)
Expand Down
5 changes: 2 additions & 3 deletions Sources/NIOSSL/SSLContext.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,9 +688,8 @@ extension NIOSSLContext {
// Load only the certificates that resolve to an existing certificate in the directory.
for symPath in certificateFilePaths {
// c_rehash only support pem files.
if let cert = try NIOSSLCertificate.fromPEMFile(symPath).first {
try addCACertificateNameToList(context: context, certificate: cert)
}
let cert = try NIOSSLCertificate(_file: symPath, format: .pem)
try addCACertificateNameToList(context: context, certificate: cert)
}
}
}
Expand Down