Skip to content

SSL support #427

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

Open
viktorasl wants to merge 10 commits into
base: stable
Choose a base branch
from
Open

SSL support #427

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8265d2c
Provide initial API for socket TLS session
viktorasl Aug 1, 2019
c3923e3
Introduce SSL .p12 certificate import API
viktorasl Aug 2, 2019
2f394db
Load demo SSL localhost certificate
viktorasl Aug 2, 2019
ff4257a
Setup TLS session connection
viktorasl Aug 2, 2019
756716d
Perform SSL handshake
viktorasl Aug 2, 2019
c5caed9
Perform reading & writing using TLS session
viktorasl Aug 2, 2019
5d64270
Add brief docs about SSL/TLS to Readme
viktorasl Aug 2, 2019
d128cbf
Document .p12 certificate loading method
viktorasl Aug 2, 2019
88c4578
Make p12 SSL cert load more type safe
viktorasl Oct 26, 2019
bfce850
Form custom SSL error message if API not available
viktorasl Nov 5, 2019
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
Prev Previous commit
Form custom SSL error message if API not available
  • Loading branch information
@viktorasl
viktorasl committed Nov 5, 2019
commit bfce850f289ff87904b887c9e31c5dc1a1ab31c5
15 changes: 13 additions & 2 deletions XCode/Sources/Errno.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,21 @@ public class Errno {

#if !os(Linux)
public class func sslError(from status: OSStatus) -> Error {
guard let msg = SecCopyErrorMessageString(status, nil) else {
guard let msg = getMessage(from: status) else {
return SocketError.tlsSessionFailed("<\(status): message is not provided>")
}
return SocketError.tlsSessionFailed(msg as NSString as String)
return SocketError.tlsSessionFailed(msg)
}

private class func getMessage(from status: OSStatus) -> String? {
if #available(iOS 11.3, tvOS 11.3, *) {
guard let msg = SecCopyErrorMessageString(status, nil) else {
return nil
}
return msg as String
} else {
return "SSL error (\(status))"
}
}
#endif
Comment on lines +17 to +35
Copy link
Copy Markdown
Member

@Vkt0r Vkt0r Nov 5, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SecCopyErrorMessageString is only available for iOS 11.3+ and we're supporting iOS 8+, not sure which is the counterpart here.

Copy link
Copy Markdown
Author

@viktorasl viktorasl Nov 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! Very weird that Xcode didn't notify me.
Could not find any counterpart so formed custom message.

}
2 changes: 2 additions & 0 deletions XCode/Sources/TlsSession.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ public enum TLS {
throw SocketError.tlsSessionFailed("Could not retrieve p12 data from given certificate")
}
// must be force casted, will be fixed in swift 5 https://bugs.swift.org/browse/SR-7015
// swiftlint:disable force_cast
let secIdentity = dictionary[kSecImportItemIdentity as String] as! SecIdentity
// swiftlint:enable force_cast
let chainWithoutIdentity = chain.dropFirst()
let certs = [secIdentity] + chainWithoutIdentity.map { $0 as Any }
return certs as CFArray
Expand Down