Keychain: make verification errors only happen when we're sure it's due to not found

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2019-10-11 21:52:55 +02:00
parent 84ca7fcf40
commit d976d159d0
2 changed files with 2 additions and 1 deletions
@@ -112,6 +112,6 @@ class Keychain {
    static func verifyReference(called ref: Data) -> Bool {
        return SecItemCopyMatching([kSecClass as String: kSecClassGenericPassword,
                                    kSecValuePersistentRef as String: ref] as CFDictionary,
-                                   nil) == errSecSuccess
+                                   nil) != errSecItemNotFound
    }
 }
@@ -70,6 +70,7 @@ class TunnelsManager {
                if let ref = passwordRef {
                    refs.insert(ref)
                } else {
+                    wg_log(.info, message: "Removing orphaned tunnel with non-verifying keychain entry: \(tunnelManager.localizedDescription ?? "<unknown>")")
                    tunnelManager.removeFromPreferences { _ in }
                    tunnelManagers.remove(at: index)
                }