Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

add a designated initializer to pass certificate data #643

Closed
wants to merge 1 commit into from
Closed

add a designated initializer to pass certificate data #643

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
39 changes: 34 additions & 5 deletions Sources/Starscream/SSLClientCertificate.swift
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class SSLClientCertificate {

/**
Convenience init.
- parameter pkcs12Path: Path to pkcs12 file containing private key and X.509 ceritifacte (.p12)
- parameter pkcs12Path: Path to pkcs12 file containing private key and X.509 certificate (.p12)
- parameter password: file password, see **kSecImportExportPassphrase**
*/
public convenience init(pkcs12Path: String, password: String) throws {
Expand All @@ -44,7 +44,7 @@ public class SSLClientCertificate {

/**
Convenience init.
- parameter pkcs12Url: URL to pkcs12 file containing private key and X.509 ceritifacte (.p12)
- parameter pkcs12Url: URL to pkcs12 file containing private key and X.509 certificate (.p12)
- parameter password: file password, see **kSecImportExportPassphrase**
*/
public convenience init(pkcs12Url: URL, password: String) throws {
Expand All @@ -57,15 +57,44 @@ public class SSLClientCertificate {
}

/**
Designated init.
- parameter pkcs12Url: URL to pkcs12 file containing private key and X.509 ceritifacte (.p12)
Convenience init.
- parameter pkcs12Url: URL to pkcs12 file containing private key and X.509 certificate (.p12)
- parameter importOptions: A dictionary containing import options. A
kSecImportExportPassphrase entry is required at minimum. Only password-based
PKCS12 blobs are currently supported. See **SecImportExport.h**
*/
public init(pkcs12Url: URL, importOptions: CFDictionary) throws {
public convenience init(pkcs12Url: URL, importOptions: CFDictionary) throws {
do {
let pkcs12Data = try Data(contentsOf: pkcs12Url)
try self.init(pkcs12Data: pkcs12Data, importOptions: importOptions)
} catch {
throw error
}
}

/**
Convenience init.
- parameter pkcs12Url: Data representing a pkcs12 file containing private key and X.509 certificate (.p12)
- parameter password: file password, see **kSecImportExportPassphrase**
*/
public convenience init(pkcs12Data: Data, password: String) throws {
let importOptions = [kSecImportExportPassphrase as String : password] as CFDictionary
do {
try self.init(pkcs12Data: pkcs12Data, importOptions: importOptions)
} catch {
throw error
}
}

/**
Designated init.
- parameter pkcs12Data: Data representing a pkcs12 file containing private key and X.509 certificate (.p12)
- parameter importOptions: A dictionary containing import options. A
kSecImportExportPassphrase entry is required at minimum. Only password-based
PKCS12 blobs are currently supported. See **SecImportExport.h**
*/
public init(pkcs12Data: Data, importOptions: CFDictionary) throws {
do {
var rawIdentitiesAndCertificates: CFArray?
let pkcs12CFData: CFData = pkcs12Data as CFData
let importStatus = SecPKCS12Import(pkcs12CFData, importOptions, &rawIdentitiesAndCertificates)
Expand Down