Rename TOUCH_ID_* enums to BIOMETRY_*

This commit is contained in:
Joel Arvidsson 2018-02-26 00:14:48 +01:00
parent abed674800
commit 618acc7789
2 changed files with 16 additions and 16 deletions

View File

@ -126,11 +126,11 @@ NSString *accessGroupValue(NSDictionary *options)
#define kAccessControlType @"accessControl" #define kAccessControlType @"accessControl"
#define kAccessControlUserPresence @"UserPresence" #define kAccessControlUserPresence @"UserPresence"
#define kAccessControlTouchIDAny @"TouchIDAny" #define kAccessControlBiometryAny @"BiometryAny"
#define kAccessControlTouchIDCurrentSet @"TouchIDCurrentSet" #define kAccessControlBiometryCurrentSet @"BiometryCurrentSet"
#define kAccessControlDevicePasscode @"DevicePasscode" #define kAccessControlDevicePasscode @"DevicePasscode"
#define kAccessControlTouchIDAnyOrDevicePasscode @"TouchIDAnyOrDevicePasscode" #define kAccessControlBiometryAnyOrDevicePasscode @"BiometryAnyOrDevicePasscode"
#define kAccessControlTouchIDCurrentSetOrDevicePasscode @"TouchIDCurrentSetOrDevicePasscode" #define kAccessControlBiometryCurrentSetOrDevicePasscode @"BiometryCurrentSetOrDevicePasscode"
#define kBiometryTypeTouchID @"TouchID" #define kBiometryTypeTouchID @"TouchID"
#define kBiometryTypeFaceID @"FaceID" #define kBiometryTypeFaceID @"FaceID"
@ -153,19 +153,19 @@ SecAccessControlCreateFlags secureAccessControl(NSDictionary *options)
if ([ options[kAccessControlType] isEqualToString: kAccessControlUserPresence ]) { if ([ options[kAccessControlType] isEqualToString: kAccessControlUserPresence ]) {
return kSecAccessControlUserPresence; return kSecAccessControlUserPresence;
} }
else if ([ options[kAccessControlType] isEqualToString: kAccessControlTouchIDAny ]) { else if ([ options[kAccessControlType] isEqualToString: kAccessControlBiometryAny ]) {
return kSecAccessControlTouchIDAny; return kSecAccessControlTouchIDAny;
} }
else if ([ options[kAccessControlType] isEqualToString: kAccessControlTouchIDCurrentSet ]) { else if ([ options[kAccessControlType] isEqualToString: kAccessControlBiometryCurrentSet ]) {
return kSecAccessControlTouchIDCurrentSet; return kSecAccessControlTouchIDCurrentSet;
} }
else if ([ options[kAccessControlType] isEqualToString: kAccessControlDevicePasscode ]) { else if ([ options[kAccessControlType] isEqualToString: kAccessControlDevicePasscode ]) {
return kSecAccessControlDevicePasscode; return kSecAccessControlDevicePasscode;
} }
else if ([ options[kAccessControlType] isEqualToString: kAccessControlTouchIDAnyOrDevicePasscode ]) { else if ([ options[kAccessControlType] isEqualToString: kAccessControlBiometryAnyOrDevicePasscode ]) {
return kSecAccessControlTouchIDAny|kSecAccessControlOr|kSecAccessControlDevicePasscode; return kSecAccessControlTouchIDAny|kSecAccessControlOr|kSecAccessControlDevicePasscode;
} }
else if ([ options[kAccessControlType] isEqualToString: kAccessControlTouchIDCurrentSetOrDevicePasscode ]) { else if ([ options[kAccessControlType] isEqualToString: kAccessControlBiometryCurrentSetOrDevicePasscode ]) {
return kSecAccessControlTouchIDCurrentSet|kSecAccessControlOr|kSecAccessControlDevicePasscode; return kSecAccessControlTouchIDCurrentSet|kSecAccessControlOr|kSecAccessControlDevicePasscode;
} }
} }

View File

@ -14,11 +14,11 @@ export const ACCESSIBLE = {
export const ACCESS_CONTROL = { export const ACCESS_CONTROL = {
USER_PRESENCE: 'UserPresence', USER_PRESENCE: 'UserPresence',
TOUCH_ID_ANY: 'TouchIDAny', BIOMETRY_ANY: 'BiometryAny',
TOUCH_ID_CURRENT_SET: 'TouchIDCurrentSet', BIOMETRY_CURRENT_SET: 'BiometryCurrentSet',
DEVICE_PASSCODE: 'DevicePasscode', DEVICE_PASSCODE: 'DevicePasscode',
TOUCH_ID_ANY_OR_DEVICE_PASSCODE: 'TouchIDAnyOrDevicePasscode', BIOMETRY_ANY_OR_DEVICE_PASSCODE: 'BiometryAnyOrDevicePasscode',
TOUCH_ID_CURRENT_SET_OR_DEVICE_PASSCODE: 'TouchIDCurrentSetOrDevicePasscode', BIOMETRY_CURRENT_SET_OR_DEVICE_PASSCODE: 'BiometryCurrentSetOrDevicePasscode',
}; };
export const AUTHENTICATION_TYPE = { export const AUTHENTICATION_TYPE = {
@ -48,11 +48,11 @@ type Options = {
type SecAccessControl = type SecAccessControl =
| 'UserPresence' | 'UserPresence'
| 'TouchIDAny' | 'BiometryAny'
| 'TouchIDCurrentSet' | 'BiometryCurrentSet'
| 'DevicePasscode' | 'DevicePasscode'
| 'TouchIDAnyOrDevicePasscode' | 'BiometryAnyOrDevicePasscode'
| 'TouchIDCurrentSetOrDevicePasscode'; | 'BiometryCurrentSetOrDevicePasscode';
type LAPolicy = 'Authentication' | 'AuthenticationWithBiometrics'; type LAPolicy = 'Authentication' | 'AuthenticationWithBiometrics';