[Bibdesk-commit] SF.net SVN: bibdesk:[27933] trunk/bibdesk/BDSKPasswordController.m

[hofman--- via Bibdesk-commit]

Revision: 27933
          http://sourceforge.net/p/bibdesk/svn/27933
Author:   hofman
Date:     2022-09-26 09:01:33 +0000 (Mon, 26 Sep 2022)
Log Message:
-----------
don't bother setting item limit to default value, use security constant for no 
error

Modified Paths:
--------------
    trunk/bibdesk/BDSKPasswordController.m

Modified: trunk/bibdesk/BDSKPasswordController.m
===================================================================
--- trunk/bibdesk/BDSKPasswordController.m      2022-09-25 23:10:02 UTC (rev 
27932)
+++ trunk/bibdesk/BDSKPasswordController.m      2022-09-26 09:01:33 UTC (rev 
27933)
@@ -47,7 +47,7 @@
 @synthesize passwordField, statusField;
 
 static inline void logError(NSString *action, OSStatus err) {
-    if (err != noErr && err != errSecItemNotFound && err != errSecUserCanceled)
+    if (err != errSecSuccess && err != errSecItemNotFound && err != 
errSecUserCanceled)
         NSLog(@"Error %d occurred %@ password: %@", (int)err, action, 
[(id)SecCopyErrorMessageString(err, NULL) autorelease]);
 }
 
@@ -59,7 +59,6 @@
     NSMutableDictionary *query = [NSMutableDictionary dictionary];
     
     [query setObject:(NSString *)kSecClassGenericPassword forKey:(NSString 
*)kSecClass];
-    [query setObject:(NSString *)kSecMatchLimitOne forKey:(NSString 
*)kSecMatchLimit];
     [query setObject:[NSNumber numberWithBool:YES] forKey:(NSString 
*)kSecReturnData];
     [query setObject:service forKey:(NSString *)kSecAttrService];
     if (account)
@@ -72,7 +71,7 @@
         [query setObject:name forKey:(NSString *)kSecAttrService];
         [query removeObjectForKey:(NSString *)kSecAttrAccount];
         err = SecItemCopyMatching((CFDictionaryRef)query, (CFTypeRef 
*)&passwordData);
-        if (err == noErr) {
+        if (err == errSecSuccess) {
             // item in old format exists, update to new format
             NSDictionary *attributes = [NSDictionary 
dictionaryWithObjectsAndKeys:service, (NSString *)kSecAttrService, account ?: 
[NSUserName() dataUsingEncoding:NSUTF8StringEncoding], (NSString 
*)kSecAttrAccount, name, (NSString *)kSecAttrLabel, nil];
             [query removeObjectForKey:(NSString *)kSecReturnData];
@@ -80,7 +79,7 @@
         }
     }
     
-    if (err == noErr) {
+    if (err == errSecSuccess) {
         passwordString = [[[NSString alloc] initWithData:passwordData 
encoding:NSUTF8StringEncoding] autorelease];
         [passwordData release];
     } else {
@@ -99,7 +98,6 @@
     
     // first try to update an existing item
     [query setObject:(NSString *)kSecClassGenericPassword forKey:(NSString 
*)kSecClass];
-    [query setObject:(NSString *)kSecMatchLimitOne forKey:(NSString 
*)kSecMatchLimit];
     [query setObject:service forKey:(NSString *)kSecAttrService];
     if (account)
         [query setObject:account forKey:(NSString *)kSecAttrAccount];
@@ -136,7 +134,7 @@
         }
     }
     
-    return (err == noErr);
+    return (err == errSecSuccess);
 }
 
 + (NSString *)passwordForKeychainServer:(NSString *)server 
port:(NSInteger)port account:(NSString *)account {
@@ -147,17 +145,16 @@
     NSMutableDictionary *query = [NSMutableDictionary dictionary];
     
     [query setObject:(NSString *)kSecClassInternetPassword forKey:(NSString 
*)kSecClass];
-    [query setObject:(NSString *)kSecMatchLimitOne forKey:(NSString 
*)kSecMatchLimit];
     [query setObject:[NSNumber numberWithBool:YES] forKey:(NSString 
*)kSecReturnData];
     [query setObject:server forKey:(NSString *)kSecAttrServer];
     [query setObject:account forKey:(NSString *)kSecAttrAccount];
-    if (port)
+    if (port != 0)
         [query setObject:[NSNumber numberWithInteger:port] forKey:(NSString 
*)kSecAttrPort];
     
     // see if the password exists in the keychain
     err = SecItemCopyMatching((CFDictionaryRef)query, (CFTypeRef 
*)&passwordData);
     
-    if (err == noErr) {
+    if (err == errSecSuccess) {
         passwordString = [[[NSString alloc] initWithData:passwordData 
encoding:NSUTF8StringEncoding] autorelease];
         [passwordData release];
     } else {
@@ -176,10 +173,9 @@
     
     // first try to update an existing item
     [query setObject:(NSString *)kSecClassInternetPassword forKey:(NSString 
*)kSecClass];
-    [query setObject:(NSString *)kSecMatchLimitOne forKey:(NSString 
*)kSecMatchLimit];
     [query setObject:server forKey:(NSString *)kSecAttrServer];
     [query setObject:account forKey:(NSString *)kSecAttrAccount];
-    if (port)
+    if (port != 0)
         [query setObject:[NSNumber numberWithInteger:port] forKey:(NSString 
*)kSecAttrPort];
 
     [attributes setObject:[password dataUsingEncoding:NSUTF8StringEncoding] 
forKey:(NSString *)kSecValueData];
@@ -190,7 +186,6 @@
     
     if (err == errSecItemNotFound) {
         [attributes addEntriesFromDictionary:query];
-        [attributes removeObjectForKey:(NSString *)kSecMatchLimit];
         [attributes setObject:(NSString *)kSecAttrProtocolHTTPS 
forKey:(NSString *)kSecAttrProtocol];
         
         if (err == errSecItemNotFound) {
@@ -202,7 +197,7 @@
         }
     }
     
-    return (err == noErr);
+    return (err == errSecSuccess);
 }
 
 - (NSString *)runModalWithMessage:(NSString *)status {

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit