Skip to content

Commit 8db60dc

Browse files
committed
Fix wrong condition when building query for Keychain.
1 parent a0f1a26 commit 8db60dc

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

Pod/Classes/A0SimpleKeychain.m

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,9 @@ - (NSDictionary *)queryFindAll {
252252
}
253253

254254
- (NSDictionary *)queryFindByKey:(NSString *)key message:(NSString *)message {
255+
NSAssert(key != nil, @"Must have a valid non-nil key");
255256
NSMutableDictionary *query = [self baseQuery];
256-
query[(__bridge id)kSecAttrAccount] = key ? key : [NSNull null];
257+
query[(__bridge id)kSecAttrAccount] = key;
257258
if (message) {
258259
query[(__bridge id)kSecUseOperationPrompt] = message;
259260
}
@@ -281,8 +282,8 @@ - (NSDictionary *)queryNewKey:(NSString *)key value:(NSData *)value {
281282
if (self.useAccessControl && floor(NSFoundationVersionNumber) > NSFoundationVersionNumber_iOS_7_1) {
282283
CFErrorRef error = NULL;
283284
SecAccessControlRef accessControl = SecAccessControlCreateWithFlags(kCFAllocatorDefault, [self accessibility], kSecAccessControlUserPresence, &error);
284-
if (error == NULL || accessControl == NULL) {
285-
query[(__bridge id)kSecAttrAccessControl] = accessControl ? (__bridge id)accessControl : [NSNull null];
285+
if (error == NULL || accessControl != NULL) {
286+
query[(__bridge id)kSecAttrAccessControl] = (__bridge id)accessControl;
286287
query[(__bridge id)kSecUseNoAuthenticationUI] = @YES;
287288
}
288289
} else {

0 commit comments

Comments
 (0)