keychain-commit Mailing List for Keychain Framework (Page 2)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 439
          http://keychain.svn.sourceforge.net/keychain/?rev=439&view=rev
Author:   wadetregaskis
Date:     2007-12-09 13:56:48 -0800 (Sun, 09 Dec 2007)

Log Message:
-----------
* Renamed setIsValid: to setPasswordIsValid:.

Modified Paths:
--------------
    trunk/Frameworks/Keychain/Keychain/KeychainItem.h
    trunk/Frameworks/Keychain/Keychain/KeychainItem.m

Modified: trunk/Frameworks/Keychain/Keychain/KeychainItem.h
===================================================================

--- trunk/Frameworks/Keychain/Keychain/KeychainItem.h	2007-12-09 21:40:09 UTC (rev 438)
+++ trunk/Frameworks/Keychain/Keychain/KeychainItem.h	2007-12-09 21:56:48 UTC (rev 439)
@@ -387,7 +387,7 @@
 
 - (void)setIsVisible:(BOOL)visible;
 
-/*! @method setIsValid:
+/*! @method setPasswordIsValid:
 	@abstract Sets whether or not the receiver's data is valid.
 	@discussion You may wish to add an entry to a keychain which is not actually valid, as a way of saying that you do not want to remember the real data for that item.  For example, if your application has the option to add passwords to the keychain when you first enter them, if the user decides not to do so you could add a placeholder item (with an empty password) and mark it invalid.  Then when your application, in future, searches for the password it will find the invalid item and know that it must prompt the user, and shouldn't try to store the password.
 
@@ -400,7 +400,7 @@
 				The default value, for new KeychainItems, is YES.
 	@param valid Whether or not the receiver's content (@link data data@/link) is valid. */
 
-- (void)setIsValid:(BOOL)valid;
+- (void)setPasswordIsValid:(BOOL)valid;
 
 /*! @method setHasCustomIcon:
 	@abstract Sets whether or not the receiver has a custom icon.

Modified: trunk/Frameworks/Keychain/Keychain/KeychainItem.m
===================================================================
--- trunk/Frameworks/Keychain/Keychain/KeychainItem.m	2007-12-09 21:40:09 UTC (rev 438)
+++ trunk/Frameworks/Keychain/Keychain/KeychainItem.m	2007-12-09 21:56:48 UTC (rev 439)
@@ -158,8 +158,8 @@
 }
 
 - (void)setData:(NSData*)data {
-	uint32_t dataLength = [data length];
-	const void *dataBytes = [data bytes];
+	uint32_t dataLength = ((nil != data) ? [data length] : 0);
+	const void *dataBytes = ((nil != data) ? [data bytes] : "");
 	
     _error = SecKeychainItemModifyContent(_keychainItem, NULL, dataLength, dataBytes);
 	
@@ -174,22 +174,22 @@
 }
 
 - (NSData*)data {
-    UInt32 length;
-    char *result;
-    NSData *res = nil;
-    
-    _error = SecKeychainItemCopyContent(_keychainItem, NULL, NULL, &length, (void**)&result);
+	NSData *res = nil;
+	UInt32 length;
+	char *result;
+	
+	_error = SecKeychainItemCopyContent(_keychainItem, NULL, NULL, &length, (void**)&result);
+	
+	if (noErr == _error) {
+		res = [NSData dataWithBytes:result length:length];
 
-    if (noErr == _error) {
-        res = [NSData dataWithBytes:result length:length];
+		OSStatus _freeError = SecKeychainItemFreeContent(NULL, result);
 
-        OSStatus _freeError = SecKeychainItemFreeContent(NULL, result);
-
-        if (noErr != _freeError) {
+		if (noErr != _freeError) {
 			PSYSLOGND(LOG_WARNING, @"Unable to free temporary buffer of KeychainItem data - error %@.\n", OSStatusAsString(_freeError));
 			PDEBUG(@"SecKeychainItemFreeContent(NULL, %p) returned error %@.\n", result, OSStatusAsString(_freeError));
-        }
-    } else {
+		}
+	} else {
 		PSYSLOGND(LOG_ERR, @"Unable to get KeychainItem data - error %@.\n", OSStatusAsString(_error));
 		PDEBUG(@"SecKeychainItemCopyContent(%p, NULL, NULL, %p [%lu], %p [%p]) returned error %@.\n", _keychainItem, &length, length, &result, result, OSStatusAsString(_error));
 	}
@@ -393,7 +393,7 @@
 	}
 }
 
-- (void)setIsValid:(BOOL)valid {
+- (void)setPasswordIsValid:(BOOL)valid {
 	if (![self _setAttribute:kSecNegativeItemAttr boolValue:!valid]) {
 		PSYSLOG(LOG_ERR, @"Unable to set KeychainItem %p's validity - error %@.\n", self, OSStatusAsString(_error));
 	}


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




2007	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (65)	Nov	Dec (15)
2008	Jan (2)	Feb	Mar (5)	Apr	May	Jun (1)	Jul	Aug	Sep	Oct	Nov	Dec
2009	Jan (7)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

keychain-commit Mailing List for Keychain Framework (Page 2)

keychain-commit — SVN commit notices