Add function to load dataRef from keychain.

digisonny · Jan 21, 2015 · 03ef4f2 · 03ef4f2
1 parent 930401e
commit 03ef4f2
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/VPNOnKit/VPNKeychainWrapper.swift b/VPNOnKit/VPNKeychainWrapper.swift
@@ -31,13 +31,13 @@ class VPNKeychainWrapper
     class func passwordForVPNID(VPNID: String) -> NSData? {
         let key = NSURL(string: VPNID)!.lastPathComponent!
         KeychainWrapper.serviceName = kKeychainServiceName
-        return KeychainWrapper.dataForKey(key)
+        return KeychainWrapper.dataRefForKey(key)
     }
 
     class func secretForVPNID(VPNID: String) -> NSData? {
         let key = NSURL(string: VPNID)!.lastPathComponent!
         KeychainWrapper.serviceName = kKeychainServiceName
-        return KeychainWrapper.dataForKey("\(key)psk")
+        return KeychainWrapper.dataRefForKey("\(key)psk")
     }
 
     class func destoryKeyForVPNID(VPNID: String) {

diff --git a/VPNOnKit/Vendor/KeychainWrapper.swift b/VPNOnKit/Vendor/KeychainWrapper.swift
@@ -82,7 +82,28 @@ class KeychainWrapper {
         keychainQueryDictionary[SecMatchLimit] = kSecMatchLimitOne
 
         // Specify we want NSData/CFData returned
-//        keychainQueryDictionary[SecReturnData] = kCFBooleanTrue
+        keychainQueryDictionary[SecReturnData] = kCFBooleanTrue
+
+        // Search
+        var searchResultRef: Unmanaged<AnyObject>?
+        var keychainValue: NSData?
+
+        let status: OSStatus = SecItemCopyMatching(keychainQueryDictionary, &searchResultRef)
+
+        if status == noErr {
+            if let resultRef = searchResultRef {
+                keychainValue = resultRef.takeUnretainedValue() as? NSData
+            }
+        }
+
+        return keychainValue;
+    }
+
+    class func dataRefForKey(keyName: String) -> NSData? {
+        var keychainQueryDictionary = self.setupKeychainQueryDictionaryForKey(keyName)
+
+        // Limit search results to one
+        keychainQueryDictionary[SecMatchLimit] = kSecMatchLimitOne
 
         keychainQueryDictionary[SecReturnPersistentRef] = kCFBooleanTrue
 
@@ -175,8 +196,6 @@ class KeychainWrapper {
 
         keychainQueryDictionary[SecAttrGeneric] = encodedIdentifier
 
-        keychainQueryDictionary[SecReturnPersistentRef] = kCFBooleanTrue
-
         keychainQueryDictionary[SecAttrAccount] = encodedIdentifier
 
         return keychainQueryDictionary