passepartoutvpn
/
wireguard-apple
mirror of https://github.com/passepartoutvpn/wireguard-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Keychain: Avoid roundtrip via items when accessing item label (stored in kSecAttrLabel) 

Signed-off-by: Andrej Mihajlov <and@mullvad.net>
This commit is contained in:
Andrej Mihajlov 2020-12-02 18:16:41 +01:00
parent 90b41aed89
commit bcc34e0bb6
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Sources/Shared/Keychain.swift
View File

@ -28,8 +28,9 @@ class Keychain {
if bundleIdentifier.hasSuffix(".network-extension") { if bundleIdentifier.hasSuffix(".network-extension") {
bundleIdentifier.removeLast(".network-extension".count) bundleIdentifier.removeLast(".network-extension".count)
} }
let itemLabel = "WireGuard Tunnel: \(name)"
var items: [CFString: Any] = [kSecClass: kSecClassGenericPassword, var items: [CFString: Any] = [kSecClass: kSecClassGenericPassword,
kSecAttrLabel: "WireGuard Tunnel: " + name, kSecAttrLabel: itemLabel,
kSecAttrAccount: name + ": " + UUID().uuidString, kSecAttrAccount: name + ": " + UUID().uuidString,
kSecAttrDescription: "wg-quick(8) config", kSecAttrDescription: "wg-quick(8) config",
kSecAttrService: bundleIdentifier, kSecAttrService: bundleIdentifier,
@ -60,9 +61,7 @@ class Keychain {
return nil return nil
} }
var access: SecAccess? var access: SecAccess?
ret = SecAccessCreate((items[kSecAttrLabel] as? String)! as CFString, ret = SecAccessCreate(itemLabel as CFString, [extensionApp!, mainApp!] as CFArray, &access)
[extensionApp!, mainApp!] as CFArray,
&access)
if ret != errSecSuccess || access == nil { if ret != errSecSuccess || access == nil {
wg_log(.error, message: "Unable to create keychain ACL object: \(ret)") wg_log(.error, message: "Unable to create keychain ACL object: \(ret)")
return nil return nil