Skip to content

Allow kSecAttrSynchronizable to be set from deleteItem #187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mCodex merged 1 commit into from
Jun 10, 2020
Merged

Allow kSecAttrSynchronizable to be set from deleteItem #187

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions ios/RNSensitiveInfo/RNSensitiveInfo.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,19 +116,20 @@ - (NSString *)messageForError:(NSError *)error
if (keychainService == NULL) {
keychainService = @"app";
}

NSNumber *sync = options[@"kSecAttrSynchronizable"];
if (sync == NULL)
sync = (__bridge id)kSecAttrSynchronizableAny;

NSData* valueData = [value dataUsingEncoding:NSUTF8StringEncoding];
NSMutableDictionary* search = [NSMutableDictionary dictionaryWithObjectsAndKeys:
(__bridge id)(kSecClassGenericPassword), kSecClass,
keychainService, kSecAttrService,
sync, kSecAttrSynchronizable,
key, kSecAttrAccount, nil];
NSMutableDictionary *query = [search mutableCopy];
[query setValue: valueData forKey: kSecValueData];

if([RCTConvert BOOL:options[@"kSecAttrSynchronizable"]]){
[query setValue:@YES forKey:(NSString *)kSecAttrSynchronizable];
}

if([RCTConvert BOOL:options[@"touchID"]]){
CFStringRef kSecAccessControlValue = convertkSecAccessControl([RCTConvert NSString:options[@"kSecAccessControl"]]);
SecAccessControlRef sac = SecAccessControlCreateWithFlags(kCFAllocatorDefault, kSecAttrAccessibleWhenPasscodeSetThisDeviceOnly, kSecAccessControlValue, NULL);
Expand Down Expand Up @@ -305,11 +306,15 @@ - (void)getItemWithQuery:(NSDictionary *)query resolver:(RCTPromiseResolveBlock)
if (keychainService == NULL) {
keychainService = @"app";
}

NSNumber *sync = options[@"kSecAttrSynchronizable"];
if (sync == NULL)
sync = (__bridge id)kSecAttrSynchronizableAny;

// Create dictionary of search parameters
NSDictionary* query = [NSDictionary dictionaryWithObjectsAndKeys:
(__bridge id)(kSecClassGenericPassword), kSecClass,
(__bridge id)(kSecAttrSynchronizableAny), kSecAttrSynchronizable,
sync, kSecAttrSynchronizable,
keychainService, kSecAttrService,
key, kSecAttrAccount,
kCFBooleanTrue, kSecReturnAttributes,
Expand Down