Renames SecAccessPolicy to AccessPolicy

Author: dm-zharov

Sources/SwiftSecurity/Keychain/Keychain.swift

@@ -181,7 +181,7 @@ extension Keychain: SecItemStore {
 // MARK: - GenericPassword
 
 extension Keychain: SecDataStore {
-    public func store<T: SecDataConvertible>(_ data: T, query: SecItemQuery<GenericPassword>, accessPolicy: SecAccessPolicy = .default) throws {
+    public func store<T: SecDataConvertible>(_ data: T, query: SecItemQuery<GenericPassword>, accessPolicy: AccessPolicy = .default) throws {
         try store(.data(data.rawRepresentation), query: query, accessPolicy: accessPolicy)
     }
 
@@ -202,7 +202,7 @@ extension Keychain: SecDataStore {
 // MARK: - InternetPassword
 
 extension Keychain {
-    public func store<T: SecDataConvertible>(_ data: T, query: SecItemQuery<InternetPassword>, accessPolicy: SecAccessPolicy = .default) throws {
+    public func store<T: SecDataConvertible>(_ data: T, query: SecItemQuery<InternetPassword>, accessPolicy: AccessPolicy = .default) throws {
         try store(.data(data.rawRepresentation), query: query, accessPolicy: accessPolicy)
     }
 
@@ -223,7 +223,7 @@ extension Keychain {
 // MARK: - SecKey
 
 extension Keychain: SecKeyStore {
-    public func store<T: SecKeyConvertible>(_ data: T, query: SecItemQuery<SecKey>, accessPolicy: SecAccessPolicy = .default) throws {
+    public func store<T: SecKeyConvertible>(_ data: T, query: SecItemQuery<SecKey>, accessPolicy: AccessPolicy = .default) throws {
         var error: Unmanaged<CFError>?
         guard
             let key: AnyObject = SecKeyCreateWithData(data.x963Representation as CFData, query.rawValue as CFDictionary, &error)
@@ -259,7 +259,7 @@ extension Keychain: SecKeyStore {
 // MARK: - SecCertificate
 
 extension Keychain: SecCertificateStore {
-    public func store<T: SecCertificateConvertible>(_ data: T, query: SecItemQuery<SecCertificate>, accessPolicy: SecAccessPolicy = .default) throws {
+    public func store<T: SecCertificateConvertible>(_ data: T, query: SecItemQuery<SecCertificate>, accessPolicy: AccessPolicy = .default) throws {
         guard let certificate = SecCertificateCreateWithData(nil, data.derRepresentation as CFData) else {
             throw SwiftSecurityError.invalidParameter
         }
@@ -307,7 +307,7 @@ extension Keychain: SecIdentityStore {
         }
     }
 
-    public func store(_ item: PKCS12.SecImportItem, query: SecItemQuery<SecIdentity>, accessPolicy: SecAccessPolicy = .default) throws {
+    public func store(_ item: PKCS12.SecImportItem, query: SecItemQuery<SecIdentity>, accessPolicy: AccessPolicy = .default) throws {
         guard let identity = item.identity else {
             throw SwiftSecurityError.invalidParameter
         }
@@ -334,7 +334,7 @@ extension Keychain: SecIdentityStore {
 // MARK: - Private
 
 private extension Keychain {
-    func store<SecItem>(_ value: SecValue<SecItem>, query: SecItemQuery<SecItem>, accessPolicy: SecAccessPolicy) throws {
+    func store<SecItem>(_ value: SecValue<SecItem>, query: SecItemQuery<SecItem>, accessPolicy: AccessPolicy) throws {
         var query = query
         query[.accessGroup] = accessGroup.rawValue
         query[.accessControl] = try accessPolicy.accessControl
@@ -455,7 +455,7 @@ extension Keychain {
 
             switch attribute {
             case .accessible:
-                return SecAccessPolicy.Accessibility(rawValue: rawValue)
+                return AccessPolicy.Accessibility(rawValue: rawValue)
             case .protocolType:
                 return ProtocolType(rawValue: rawValue)
             case .authenticationType:

Sources/SwiftSecurity/Keychain/SecItemStore/SecItemInfo.swift

@@ -29,10 +29,10 @@ public extension SecItemInfo {
     }
 
     /// The corresponding value indicates the item’s one and only access group.
-    var accessible: SecAccessPolicy.Accessibility? {
+    var accessible: AccessPolicy.Accessibility? {
         get {
             if let rawValue = self[.accessible] as? String {
-                return SecAccessPolicy.Accessibility(rawValue: rawValue)
+                return AccessPolicy.Accessibility(rawValue: rawValue)
             } else {
                 return nil
             }

Sources/SwiftSecurity/Keychain/SecItemStore/SecItemStore.swift

@@ -21,29 +21,29 @@ public protocol SecItemStore {
 public protocol SecDataStore: SecItemStore {
     // MARK: - Generic
 
-    func store<T: SecDataConvertible>(_ data: T, query: SecItemQuery<GenericPassword>, accessPolicy: SecAccessPolicy) throws
+    func store<T: SecDataConvertible>(_ data: T, query: SecItemQuery<GenericPassword>, accessPolicy: AccessPolicy) throws
     func retrieve<T: SecDataConvertible>(_ query: SecItemQuery<GenericPassword>, authenticationContext: LAContext?) throws -> T?
     func remove(_ query: SecItemQuery<GenericPassword>) throws -> Bool
 
     // MARK: - Internet
 
-    func store<T: SecDataConvertible>(_ data: T, query: SecItemQuery<InternetPassword>, accessPolicy: SecAccessPolicy) throws
+    func store<T: SecDataConvertible>(_ data: T, query: SecItemQuery<InternetPassword>, accessPolicy: AccessPolicy) throws
     func retrieve<T: SecDataConvertible>(_ query: SecItemQuery<InternetPassword>, authenticationContext: LAContext?) throws -> T?
     func remove(_ query: SecItemQuery<InternetPassword>) throws -> Bool
 }
 
 // MARK: - SecKey
 
 public protocol SecKeyStore: SecItemStore {
-    func store<T: SecKeyConvertible>(_ key: T, query: SecItemQuery<SecKey>, accessPolicy: SecAccessPolicy) throws
+    func store<T: SecKeyConvertible>(_ key: T, query: SecItemQuery<SecKey>, accessPolicy: AccessPolicy) throws
     func retrieve<T: SecKeyConvertible>(_ query: SecItemQuery<SecKey>, authenticationContext: LAContext?) throws -> T?
     func remove(_ query: SecItemQuery<SecKey>) throws -> Bool
 }
 
 // MARK: - SecCertificate
 
 public protocol SecCertificateStore: SecItemStore {
-    func store<T: SecCertificateConvertible>(_ data: T, query: SecItemQuery<SecCertificate>, accessPolicy: SecAccessPolicy) throws
+    func store<T: SecCertificateConvertible>(_ data: T, query: SecItemQuery<SecCertificate>, accessPolicy: AccessPolicy) throws
     func retrieve<T: SecCertificateConvertible>(_ query: SecItemQuery<SecCertificate>, authenticationContext: LAContext?) throws -> T?
     func remove(_ query: SecItemQuery<SecCertificate>) throws -> Bool
 }
@@ -52,7 +52,7 @@ public protocol SecCertificateStore: SecItemStore {
 
 public protocol SecIdentityStore: SecItemStore {
     func `import`<T: SecIdentityConvertible>(_ data: T, passphrase: String) throws -> [PKCS12.SecImportItem]
-    func store(_ item: PKCS12.SecImportItem, query: SecItemQuery<SecIdentity>, accessPolicy: SecAccessPolicy) throws
+    func store(_ item: PKCS12.SecImportItem, query: SecItemQuery<SecIdentity>, accessPolicy: AccessPolicy) throws
     func retrieve(_ query: SecItemQuery<SecIdentity>, authenticationContext: LAContext?) throws -> SecIdentity?
     func remove(_ query: SecItemQuery<SecIdentity>) throws -> Bool
 }