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

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
Next Next commit
Make p12 SSL cert load more type safe
  • Loading branch information
@viktorasl
viktorasl committed Oct 26, 2019
commit 88c4578826a8ed7c698a11c833b48e4fdada041c
30 changes: 19 additions & 11 deletions XCode/Sources/TlsSession.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,22 @@ public enum TLS {
/// Apple docs contain a misleading information that it does not import items to Keychain even though
/// it does.
///
/// - Parameter _data: .p12 certificate file content
/// - Parameter data: .p12 certificate file content
/// - Parameter password: password used when importing certificate
public static func loadP12Certificate(_ _data: Data, _ password: String) throws -> CFArray {
let data = _data as NSData
let options = [kSecImportExportPassphrase: password]
var items: CFArray!
try ensureNoErr(SecPKCS12Import(data, options as NSDictionary, &items))
let dictionary = (items! as [AnyObject])[0]
let secIdentity = dictionary[kSecImportItemIdentity] as! SecIdentity
let chain = dictionary[kSecImportItemCertChain] as! [SecCertificate]
let certs = [secIdentity] + chain.dropFirst().map { $0 as Any }
public static func loadP12Certificate(_ data: Data, _ password: String) throws -> CFArray {
let options = [kSecImportExportPassphrase as String: password]
var items: CFArray?
try ensureNoErr(SecPKCS12Import(data as CFData, options as NSDictionary, &items))
guard
let dictionary = (items as? [[String: Any]])?.first,
let chain = dictionary[kSecImportItemCertChain as String] as? [SecCertificate]
else {
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
let secIdentity = dictionary[kSecImportItemIdentity as String] as! SecIdentity
let chainWithoutIdentity = chain.dropFirst()
let certs = [secIdentity] + chainWithoutIdentity.map { $0 as Any }
return certs as CFArray
}
}
Expand All @@ -42,7 +47,10 @@ open class TlsSession {
private var fdPtr = UnsafeMutablePointer<Int32>.allocate(capacity: 1)

init(fd: Int32, certificate: CFArray) throws {
context = SSLCreateContext(nil, .serverSide, .streamType)!
guard let newContext = SSLCreateContext(nil, .serverSide, .streamType) else {
throw SocketError.tlsSessionFailed("Could not create new SSL context")
}
context = newContext
fdPtr.pointee = fd
try ensureNoErr(SSLSetIOFuncs(context, sslRead, sslWrite))
try ensureNoErr(SSLSetConnection(context, fdPtr))
Expand Down