cheykrym/socket.io-client-swift
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'evanbrass-fix-optional-unwrapping' into swift2.3

Browse Source 
* evanbrass-fix-optional-unwrapping:
  Fix errors with force unwrapping optionals
This commit is contained in:
Erik 2016-07-28 21:19:47 -04:00
commit a74d2fba85
No known key found for this signature in database
GPG Key ID: 4930B7C5FBC1A69D
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/SSLSecurity.swift
View File

@ -141,9 +141,9 @@ public class SSLSecurity : NSObject {
}
var policy: SecPolicyRef
if self.validatedDN {
policy = SecPolicyCreateSSL(true, domain)!
policy = SecPolicyCreateSSL(true, domain)
} else {
policy = SecPolicyCreateBasicX509()!
policy = SecPolicyCreateBasicX509()
}
SecTrustSetPolicies(trust,policy)
if self.usePublicKeys {
@ -194,7 +194,7 @@ public class SSLSecurity : NSObject {
func extractPublicKey(data: NSData) -> SecKeyRef? {
guard let cert = SecCertificateCreateWithData(nil, data) else { return nil }
return extractPublicKeyFromCert(cert, policy: SecPolicyCreateBasicX509()!)
return extractPublicKeyFromCert(cert, policy: SecPolicyCreateBasicX509())
}
/**
@ -245,7 +245,7 @@ public class SSLSecurity : NSObject {
let keys = (0..<SecTrustGetCertificateCount(trust)).reduce([SecKeyRef]()) { (keys: [SecKeyRef], index: Int) -> [SecKeyRef] in
var keys = keys
let cert = SecTrustGetCertificateAtIndex(trust, index)
if let key = extractPublicKeyFromCert(cert!, policy: policy!) {
if let key = extractPublicKeyFromCert(cert!, policy: policy) {
keys.append(key)
}