Merge pull request #271 from kishikawakatsumi/3.0.1

Make lowercase AuthenticationPolicy enums (OptionSet)

Lib/KeychainAccess/Keychain.swift

@@ -156,7 +156,7 @@ public struct AuthenticationPolicy: OptionSet {
      */
     @available(iOS 8.0, OSX 10.10, *)
     @available(watchOS, unavailable)
-    public static let UserPresence = AuthenticationPolicy(rawValue: 1 << 0)
+    public static let userPresence = AuthenticationPolicy(rawValue: 1 << 0)
 
     /**
      Constraint: Touch ID (any finger). Touch ID must be available and
@@ -166,7 +166,7 @@ public struct AuthenticationPolicy: OptionSet {
     @available(iOS 9.0, *)
     @available(OSX, unavailable)
     @available(watchOS, unavailable)
-    public static let TouchIDAny = AuthenticationPolicy(rawValue: 1 << 1)
+    public static let touchIDAny = AuthenticationPolicy(rawValue: 1 << 1)
 
     /**
      Constraint: Touch ID from the set of currently enrolled fingers.
@@ -176,14 +176,14 @@ public struct AuthenticationPolicy: OptionSet {
     @available(iOS 9.0, *)
     @available(OSX, unavailable)
     @available(watchOS, unavailable)
-    public static let TouchIDCurrentSet = AuthenticationPolicy(rawValue: 1 << 3)
+    public static let touchIDCurrentSet = AuthenticationPolicy(rawValue: 1 << 3)
 
     /**
      Constraint: Device passcode
      */
     @available(iOS 9.0, OSX 10.11, *)
     @available(watchOS, unavailable)
-    public static let DevicePasscode = AuthenticationPolicy(rawValue: 1 << 4)
+    public static let devicePasscode = AuthenticationPolicy(rawValue: 1 << 4)
 
     /**
      Constraint logic operation: when using more than one constraint,
@@ -192,7 +192,7 @@ public struct AuthenticationPolicy: OptionSet {
     @available(iOS 9.0, *)
     @available(OSX, unavailable)
     @available(watchOS, unavailable)
-    public static let Or = AuthenticationPolicy(rawValue: 1 << 14)
+    public static let or = AuthenticationPolicy(rawValue: 1 << 14)
 
     /**
      Constraint logic operation: when using more than one constraint,
@@ -201,7 +201,7 @@ public struct AuthenticationPolicy: OptionSet {
     @available(iOS 9.0, *)
     @available(OSX, unavailable)
     @available(watchOS, unavailable)
-    public static let And = AuthenticationPolicy(rawValue: 1 << 15)
+    public static let and = AuthenticationPolicy(rawValue: 1 << 15)
 
     /**
      Create access control for private key operations (i.e. sign operation)
@@ -209,7 +209,7 @@ public struct AuthenticationPolicy: OptionSet {
     @available(iOS 9.0, *)
     @available(OSX, unavailable)
     @available(watchOS, unavailable)
-    public static let PrivateKeyUsage = AuthenticationPolicy(rawValue: 1 << 30)
+    public static let privateKeyUsage = AuthenticationPolicy(rawValue: 1 << 30)
 
     /**
      Security: Application provided password for data encryption key generation.
@@ -218,7 +218,7 @@ public struct AuthenticationPolicy: OptionSet {
     @available(iOS 9.0, *)
     @available(OSX, unavailable)
     @available(watchOS, unavailable)
-    public static let ApplicationPassword = AuthenticationPolicy(rawValue: 1 << 31)
+    public static let applicationPassword = AuthenticationPolicy(rawValue: 1 << 31)
 
     #if swift(>=2.3)
     public let rawValue: UInt

Lib/KeychainAccessTests/KeychainAccessTests.swift

@@ -489,7 +489,7 @@ class KeychainAccessTests: XCTestCase {
 
                 let keychain = Keychain(service: "Twitter")
                     .attributes(attributes)
-                    .accessibility(.whenPasscodeSetThisDeviceOnly, authenticationPolicy: .UserPresence)
+                    .accessibility(.whenPasscodeSetThisDeviceOnly, authenticationPolicy: .userPresence)
 
                 XCTAssertNil(keychain["kishikawakatsumi"], "not stored password")
 
@@ -1023,8 +1023,8 @@ class KeychainAccessTests: XCTestCase {
         XCTAssertEqual(keychain.synchronizable(true).synchronizable, true)
         XCTAssertEqual(keychain.synchronizable(false).synchronizable, false)
         XCTAssertEqual(keychain.accessibility(.afterFirstUnlock).accessibility, Accessibility.afterFirstUnlock)
-        XCTAssertEqual(keychain.accessibility(.whenPasscodeSetThisDeviceOnly, authenticationPolicy: .UserPresence).accessibility, Accessibility.whenPasscodeSetThisDeviceOnly)
-        XCTAssertEqual(keychain.accessibility(.whenPasscodeSetThisDeviceOnly, authenticationPolicy: .UserPresence).authenticationPolicy, AuthenticationPolicy.UserPresence)
+        XCTAssertEqual(keychain.accessibility(.whenPasscodeSetThisDeviceOnly, authenticationPolicy: .userPresence).accessibility, Accessibility.whenPasscodeSetThisDeviceOnly)
+        XCTAssertEqual(keychain.accessibility(.whenPasscodeSetThisDeviceOnly, authenticationPolicy: .userPresence).authenticationPolicy, AuthenticationPolicy.userPresence)
         XCTAssertNil(keychain.label)
         XCTAssertEqual(keychain.label("Label").label, "Label")
         XCTAssertNil(keychain.comment)
@@ -1254,7 +1254,7 @@ class KeychainAccessTests: XCTestCase {
         do {
             let accessibility: Accessibility = .whenPasscodeSetThisDeviceOnly
 
-            let policy: AuthenticationPolicy = [.UserPresence]
+            let policy: AuthenticationPolicy = [.userPresence]
             let flags = SecAccessControlCreateFlags(rawValue: policy.rawValue)
 
             var error: Unmanaged<CFError>?
@@ -1267,7 +1267,7 @@ class KeychainAccessTests: XCTestCase {
         do {
             let accessibility: Accessibility = .whenPasscodeSetThisDeviceOnly
 
-            let policy: AuthenticationPolicy = [.UserPresence, .ApplicationPassword]
+            let policy: AuthenticationPolicy = [.userPresence, .applicationPassword]
             let flags = SecAccessControlCreateFlags(rawValue: policy.rawValue)
 
             var error: Unmanaged<CFError>?
@@ -1279,7 +1279,7 @@ class KeychainAccessTests: XCTestCase {
         do {
             let accessibility: Accessibility = .whenPasscodeSetThisDeviceOnly
 
-            let policy: AuthenticationPolicy = [.UserPresence, .ApplicationPassword, .PrivateKeyUsage]
+            let policy: AuthenticationPolicy = [.userPresence, .applicationPassword, .privateKeyUsage]
             let flags = SecAccessControlCreateFlags(rawValue: policy.rawValue)
 
             var error: Unmanaged<CFError>?
@@ -1291,7 +1291,7 @@ class KeychainAccessTests: XCTestCase {
         do {
             let accessibility: Accessibility = .whenPasscodeSetThisDeviceOnly
 
-            let policy: AuthenticationPolicy = [.ApplicationPassword]
+            let policy: AuthenticationPolicy = [.applicationPassword]
             let flags = SecAccessControlCreateFlags(rawValue: policy.rawValue)
 
             var error: Unmanaged<CFError>?
@@ -1303,7 +1303,7 @@ class KeychainAccessTests: XCTestCase {
         do {
             let accessibility: Accessibility = .whenPasscodeSetThisDeviceOnly
 
-            let policy: AuthenticationPolicy = [.ApplicationPassword, .PrivateKeyUsage]
+            let policy: AuthenticationPolicy = [.applicationPassword, .privateKeyUsage]
             let flags = SecAccessControlCreateFlags(rawValue: policy.rawValue)
 
             var error: Unmanaged<CFError>?
@@ -1315,7 +1315,7 @@ class KeychainAccessTests: XCTestCase {
         do {
             let accessibility: Accessibility = .whenPasscodeSetThisDeviceOnly
 
-            let policy: AuthenticationPolicy = [.PrivateKeyUsage]
+            let policy: AuthenticationPolicy = [.privateKeyUsage]
             let flags = SecAccessControlCreateFlags(rawValue: policy.rawValue)
 
             var error: Unmanaged<CFError>?
@@ -1327,7 +1327,7 @@ class KeychainAccessTests: XCTestCase {
         do {
             let accessibility: Accessibility = .whenPasscodeSetThisDeviceOnly
 
-            let policy: AuthenticationPolicy = [.TouchIDAny]
+            let policy: AuthenticationPolicy = [.touchIDAny]
             let flags = SecAccessControlCreateFlags(rawValue: policy.rawValue)
 
             var error: Unmanaged<CFError>?
@@ -1339,7 +1339,7 @@ class KeychainAccessTests: XCTestCase {
         do {
             let accessibility: Accessibility = .whenPasscodeSetThisDeviceOnly
 
-            let policy: AuthenticationPolicy = [.TouchIDAny, .DevicePasscode]
+            let policy: AuthenticationPolicy = [.touchIDAny, .devicePasscode]
             let flags = SecAccessControlCreateFlags(rawValue: policy.rawValue)
 
             var error: Unmanaged<CFError>?
@@ -1351,7 +1351,7 @@ class KeychainAccessTests: XCTestCase {
         do {
             let accessibility: Accessibility = .whenPasscodeSetThisDeviceOnly
 
-            let policy: AuthenticationPolicy = [.TouchIDAny, .ApplicationPassword]
+            let policy: AuthenticationPolicy = [.touchIDAny, .applicationPassword]
             let flags = SecAccessControlCreateFlags(rawValue: policy.rawValue)
 
             var error: Unmanaged<CFError>?
@@ -1363,7 +1363,7 @@ class KeychainAccessTests: XCTestCase {
         do {
             let accessibility: Accessibility = .whenPasscodeSetThisDeviceOnly
 
-            let policy: AuthenticationPolicy = [.TouchIDAny, .ApplicationPassword, .PrivateKeyUsage]
+            let policy: AuthenticationPolicy = [.touchIDAny, .applicationPassword, .privateKeyUsage]
             let flags = SecAccessControlCreateFlags(rawValue: policy.rawValue)
 
             var error: Unmanaged<CFError>?
@@ -1375,7 +1375,7 @@ class KeychainAccessTests: XCTestCase {
         do {
             let accessibility: Accessibility = .whenPasscodeSetThisDeviceOnly
 
-            let policy: AuthenticationPolicy = [.TouchIDCurrentSet]
+            let policy: AuthenticationPolicy = [.touchIDCurrentSet]
             let flags = SecAccessControlCreateFlags(rawValue: policy.rawValue)
 
             var error: Unmanaged<CFError>?
@@ -1387,7 +1387,7 @@ class KeychainAccessTests: XCTestCase {
         do {
             let accessibility: Accessibility = .whenPasscodeSetThisDeviceOnly
 
-            let policy: AuthenticationPolicy = [.TouchIDCurrentSet, .DevicePasscode]
+            let policy: AuthenticationPolicy = [.touchIDCurrentSet, .devicePasscode]
             let flags = SecAccessControlCreateFlags(rawValue: policy.rawValue)
 
             var error: Unmanaged<CFError>?
@@ -1399,7 +1399,7 @@ class KeychainAccessTests: XCTestCase {
         do {
             let accessibility: Accessibility = .whenPasscodeSetThisDeviceOnly
 
-            let policy: AuthenticationPolicy = [.TouchIDCurrentSet, .ApplicationPassword]
+            let policy: AuthenticationPolicy = [.touchIDCurrentSet, .applicationPassword]
             let flags = SecAccessControlCreateFlags(rawValue: policy.rawValue)
 
             var error: Unmanaged<CFError>?
@@ -1411,7 +1411,7 @@ class KeychainAccessTests: XCTestCase {
         do {
             let accessibility: Accessibility = .whenPasscodeSetThisDeviceOnly
 
-            let policy: AuthenticationPolicy = [.TouchIDCurrentSet, .ApplicationPassword, .PrivateKeyUsage]
+            let policy: AuthenticationPolicy = [.touchIDCurrentSet, .applicationPassword, .privateKeyUsage]
             let flags = SecAccessControlCreateFlags(rawValue: policy.rawValue)
 
             var error: Unmanaged<CFError>?
@@ -1423,7 +1423,7 @@ class KeychainAccessTests: XCTestCase {
         do {
             let accessibility: Accessibility = .whenPasscodeSetThisDeviceOnly
 
-            let policy: AuthenticationPolicy = [.TouchIDAny, .Or, .DevicePasscode]
+            let policy: AuthenticationPolicy = [.touchIDAny, .or, .devicePasscode]
             let flags = SecAccessControlCreateFlags(rawValue: policy.rawValue)
 
             var error: Unmanaged<CFError>?
@@ -1435,7 +1435,7 @@ class KeychainAccessTests: XCTestCase {
         do {
             let accessibility: Accessibility = .whenPasscodeSetThisDeviceOnly
 
-            let policy: AuthenticationPolicy = [.TouchIDAny, .And, .DevicePasscode]
+            let policy: AuthenticationPolicy = [.touchIDAny, .and, .devicePasscode]
             let flags = SecAccessControlCreateFlags(rawValue: policy.rawValue)
 
             var error: Unmanaged<CFError>?
@@ -1449,7 +1449,7 @@ class KeychainAccessTests: XCTestCase {
         do {
             let accessibility: Accessibility = .whenPasscodeSetThisDeviceOnly
 
-            let policy: AuthenticationPolicy = [.UserPresence]
+            let policy: AuthenticationPolicy = [.userPresence]
             let flags = SecAccessControlCreateFlags(rawValue: policy.rawValue)
 
             var error: Unmanaged<CFError>?
@@ -1461,7 +1461,7 @@ class KeychainAccessTests: XCTestCase {
         do {
             let accessibility: Accessibility = .whenPasscodeSetThisDeviceOnly
 
-            let policy: AuthenticationPolicy = [.DevicePasscode]
+            let policy: AuthenticationPolicy = [.devicePasscode]
             let flags = SecAccessControlCreateFlags(rawValue: policy.rawValue)
 
             var error: Unmanaged<CFError>?