add methods to accept arbitrary data and make string methods use dat…

…a methods
samsoffes · Apr 28, 2012 · fbcadcc · fbcadcc
1 parent 356eaf7
commit fbcadcc
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 10 deletions.
diff --git a/SSKeychain.h b/SSKeychain.h
@@ -185,6 +185,16 @@ extern NSString *const kSSKeychainWhereKey;
  */
 + (NSString *)passwordForService:(NSString *)serviceName account:(NSString *)account error:(NSError **)error;
 
+/**
+ 
+ */
++ (NSData *)passwordDataForService:(NSString *)serviceName account:(NSString *)account;
+
+/**
+ 
+ */
++ (NSData *)passwordDataForService:(NSString *)serviceName account:(NSString *)account error:(NSError **)error;
+
 
 ///-------------------------
 /// @name Deleting Passwords
@@ -255,6 +265,16 @@ extern NSString *const kSSKeychainWhereKey;
  */
 + (BOOL)setPassword:(NSString *)password forService:(NSString *)serviceName account:(NSString *)account error:(NSError **)error;
 
+/**
+ 
+ */
++ (BOOL)setPasswordData:(NSData *)password forService:(NSString *)serviceName account:(NSString *)account;
+
+/**
+ 
+ */
++ (BOOL)setPasswordData:(NSData *)password forService:(NSString *)serviceName account:(NSString *)account error:(NSError **)error;
+
 
 ///--------------------
 /// @name Configuration

diff --git a/SSKeychain.m b/SSKeychain.m
@@ -67,26 +67,31 @@ + (NSString *)passwordForService:(NSString *)service account:(NSString *)account
 
 
 + (NSString *)passwordForService:(NSString *)service account:(NSString *)account error:(NSError **)error {
+    NSData *data = [self passwordDataForService:service account:account error:error];
+    return ([data length]) ? [[[NSString alloc] initWithData:(NSData *)data encoding:NSUTF8StringEncoding] autorelease] : nil;
+}
+
+
++ (NSData *)passwordDataForService:(NSString *)service account:(NSString *)account {
+    return [self passwordDataForService:service account:account error:nil];
+}
+
+
++ (NSData *)passwordDataForService:(NSString *)service account:(NSString *)account error:(NSError **)error {
     OSStatus status = SSKeychainErrorBadArguments;
-	NSString *result = nil;
+    NSData *result = nil;
 	if (service && account) {
-		CFDataRef data = NULL;
 		NSMutableDictionary *query = [self _queryForService:service account:account];
 		[query setObject:(id)kCFBooleanTrue forKey:(id)kSecReturnData];
 		[query setObject:(id)kSecMatchLimitOne forKey:(id)kSecMatchLimit];
-		status = SecItemCopyMatching((CFDictionaryRef)query, (CFTypeRef *)&data);
-		if (status == noErr && CFDataGetLength(data) > 0) {
-			result = [[NSString alloc] initWithData:(NSData *)data encoding:NSUTF8StringEncoding];
-		}
-		if (data != NULL) { CFRelease(data); }
+		status = SecItemCopyMatching((CFDictionaryRef)query, (CFTypeRef *)&result);
 	}
 	if (status != noErr && error != NULL) {
 		*error = [NSError errorWithDomain:kSSKeychainErrorDomain code:status userInfo:nil];
 	}
 	return [result autorelease];
 }
 
-
 #pragma mark - Deleting Passwords
 
 + (BOOL)deletePasswordForService:(NSString *)service account:(NSString *)account {
@@ -116,11 +121,22 @@ + (BOOL)setPassword:(NSString *)password forService:(NSString *)service account:
 
 
 + (BOOL)setPassword:(NSString *)password forService:(NSString *)service account:(NSString *)account error:(NSError **)error {
-	OSStatus status = SSKeychainErrorBadArguments;
+    NSData *data = [password dataUsingEncoding:NSUTF8StringEncoding];
+    return [self setPasswordData:data forService:service account:account error:error];
+}
+
+
++ (BOOL)setPasswordData:(NSData *)password forService:(NSString *)service account:(NSString *)account {
+    return [self setPasswordData:password forService:service account:account error:nil];
+}
+
+
++ (BOOL)setPasswordData:(NSData *)password forService:(NSString *)service account:(NSString *)account error:(NSError **)error {
+    OSStatus status = SSKeychainErrorBadArguments;
 	if (password && service && account) {
         [self deletePasswordForService:service account:account];
         NSMutableDictionary *query = [self _queryForService:service account:account];
-        [query setObject:[password dataUsingEncoding:NSUTF8StringEncoding] forKey:(id)kSecValueData];
+        [query setObject:password forKey:(id)kSecValueData];
 
 #if __IPHONE_4_0 && TARGET_OS_IPHONE
 		if (SSKeychainAccessibilityType) {