Project updates

square · Oct 11, 2024 · 9919686 · 9919686
1 parent ccf73cb
commit 9919686
Show file tree

Hide file tree

Showing 13 changed files with 291 additions and 157 deletions.
diff --git a/Sources/Valet/SecureEnclaveAccessControl.swift b/Sources/Valet/SecureEnclaveAccessControl.swift
@@ -67,46 +67,30 @@ public enum SecureEnclaveAccessControl: Int, CustomStringConvertible, Equatable,
     internal var secAccessControl: SecAccessControlCreateFlags {
         switch self {
         case .userPresence:
-            return .userPresence
+            .userPresence
         case .biometricAny:
-            if #available(iOS 11.3, tvOS 11.3, watchOS 4.3, macOS 10.13.4, *) {
-                return .biometryAny
-            } else if #available(macOS 10.12.1, *) {
-                return .touchIDAny
+            if #available(watchOS 4.3, macOS 10.13.4, *) {
+                .biometryAny
             } else {
-                assertionFailure(".biometricAny requires macOS 10.12.1.")
-                return .userPresence
+                .touchIDAny
             }
         case .biometricCurrentSet:
-            if #available(iOS 11.3, tvOS 11.3, watchOS 4.3, macOS 10.13.4, *) {
-                return .biometryCurrentSet
-            } else if #available(macOS 10.12.1, *) {
-                return .touchIDCurrentSet
+            if #available(watchOS 4.3, macOS 10.13.4, *) {
+                .biometryCurrentSet
             } else {
-                assertionFailure(".biometricCurrentSet requires macOS 10.12.1.")
-                return .userPresence
+                .touchIDCurrentSet
             }
         case .devicePasscode:
-            if #available(macOS 10.11, *) {
-                return .devicePasscode
-            } else {
-                assertionFailure(".devicePasscode requires macOS 10.11.")
-                return .userPresence
-            }
+            .devicePasscode
         }
     }
 
     internal static func allValues() -> [SecureEnclaveAccessControl] {
-        var values: [SecureEnclaveAccessControl] = [
+        [
             .userPresence,
-            .devicePasscode
+            .devicePasscode,
+            .biometricAny,
+            .biometricCurrentSet,
         ]
-        if #available(macOS 10.12.1, *) {
-            values += [
-                .biometricAny,
-                .biometricCurrentSet,
-            ]
-        }
-        return values
     }
 }