Merge pull request #36 from square/federman/kSecUseAuthenticationUI_iOS9

Support use of kSecUseNoAuthenticationUI on iOS 8 and Xcode 7
square · Aug 25, 2015 · 6a5fa57 · 6a5fa57
2 parents 4cc2279 + 8af66e5
commit 6a5fa57
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/Valet/VALSecureEnclaveValet.m b/Valet/VALSecureEnclaveValet.m
@@ -86,13 +86,24 @@ - (BOOL)canAccessKeychain;
 - (BOOL)containsObjectForKey:(nonnull NSString *)key;
 {
 #if VAL_IOS_8_OR_LATER
-
+    NSDictionary *options = nil;
+
 #if VAL_IOS_9_OR_LATER
-    OSStatus status = [self containsObjectForKey:key options:@{ (__bridge id)kSecUseAuthenticationUI : (__bridge id)kSecUseAuthenticationUIFail }];
+    if (&kSecUseAuthenticationUI != NULL) {
+        options = @{ (__bridge id)kSecUseAuthenticationUI : (__bridge id)kSecUseAuthenticationUIFail };
+    } else {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+        // kSecUseNoAuthenticationUI is deprecated in the iOS 9 SDK, but we still need it on iOS 8.
+        options = @{ (__bridge id)kSecUseNoAuthenticationUI : @YES };
+#pragma GCC diagnostic pop
+    }
 #else
-    OSStatus status = [self containsObjectForKey:key options:@{ (__bridge id)kSecUseNoAuthenticationUI : @YES }];
+    options = @{ (__bridge id)kSecUseNoAuthenticationUI : @YES };
 #endif
 
+    OSStatus status = [self containsObjectForKey:key options:options];
+
     BOOL const keyAlreadyInKeychain = (status == errSecInteractionNotAllowed || status == errSecSuccess);
     return keyAlreadyInKeychain;