Merge pull request #468 from Simperium/develop

Simperium Mark 0.7.9

External/SSKeychain/SSKeychain.h → External/SSKeychain/SPKeychain.h

@@ -6,48 +6,48 @@
 //  Copyright (c) 2010-2014 Sam Soffes. All rights reserved.
 //
 
-#import "SSKeychainQuery.h"
+#import "SPKeychainQuery.h"
 
 /**
  Error code specific to SSKeychain that can be returned in NSError objects.
  For codes returned by the operating system, refer to SecBase.h for your
  platform.
  */
-typedef NS_ENUM(OSStatus, SSKeychainErrorCode) {
+typedef NS_ENUM(OSStatus, SPKeychainErrorCode) {
 	/** Some of the arguments were invalid. */
-	SSKeychainErrorBadArguments = -1001,
+	SPKeychainErrorBadArguments = -1001,
 };
 
 /** SSKeychain error domain */
-extern NSString *const kSSKeychainErrorDomain;
+extern NSString *const kSPKeychainErrorDomain;
 
 /** Account name. */
-extern NSString *const kSSKeychainAccountKey;
+extern NSString *const kSPKeychainAccountKey;
 
 /**
  Time the item was created.
 
  The value will be a string.
  */
-extern NSString *const kSSKeychainCreatedAtKey;
+extern NSString *const kSPKeychainCreatedAtKey;
 
 /** Item class. */
-extern NSString *const kSSKeychainClassKey;
+extern NSString *const kSPKeychainClassKey;
 
 /** Item description. */
-extern NSString *const kSSKeychainDescriptionKey;
+extern NSString *const kSPKeychainDescriptionKey;
 
 /** Item label. */
-extern NSString *const kSSKeychainLabelKey;
+extern NSString *const kSPKeychainLabelKey;
 
 /** Time the item was last modified.
 
  The value will be a string.
  */
-extern NSString *const kSSKeychainLastModifiedKey;
+extern NSString *const kSPKeychainLastModifiedKey;
 
 /** Where the item was created. */
-extern NSString *const kSSKeychainWhereKey;
+extern NSString *const kSPKeychainWhereKey;
 
 /**
  Simple wrapper for accessing accounts, getting passwords, setting passwords, and deleting passwords using the system
@@ -56,7 +56,7 @@ extern NSString *const kSSKeychainWhereKey;
  This was originally inspired by EMKeychain and SDKeychain (both of which are now gone). Thanks to the authors.
  SSKeychain has since switched to a simpler implementation that was abstracted from [SSToolkit](http://sstoolk.it).
  */
-@interface SSKeychain : NSObject
+@interface SPKeychain : NSObject
 
 #pragma mark - Classic methods
 

External/SSKeychain/SSKeychain.m → External/SSKeychain/SPKeychain.m

@@ -6,30 +6,30 @@
 //  Copyright (c) 2010-2014 Sam Soffes. All rights reserved.
 //
 
-#import "SSKeychain.h"
+#import "SPKeychain.h"
 
-NSString *const kSSKeychainErrorDomain = @"com.samsoffes.sskeychain";
-NSString *const kSSKeychainAccountKey = @"acct";
-NSString *const kSSKeychainCreatedAtKey = @"cdat";
-NSString *const kSSKeychainClassKey = @"labl";
-NSString *const kSSKeychainDescriptionKey = @"desc";
-NSString *const kSSKeychainLabelKey = @"labl";
-NSString *const kSSKeychainLastModifiedKey = @"mdat";
-NSString *const kSSKeychainWhereKey = @"svce";
+NSString *const kSPKeychainErrorDomain = @"com.samsoffes.sskeychain";
+NSString *const kSPKeychainAccountKey = @"acct";
+NSString *const kSPKeychainCreatedAtKey = @"cdat";
+NSString *const kSPKeychainClassKey = @"labl";
+NSString *const kSPKeychainDescriptionKey = @"desc";
+NSString *const kSPKeychainLabelKey = @"labl";
+NSString *const kSPKeychainLastModifiedKey = @"mdat";
+NSString *const kSPKeychainWhereKey = @"svce";
 
 #if __IPHONE_4_0 && TARGET_OS_IPHONE
 	static CFTypeRef SSKeychainAccessibilityType = NULL;
 #endif
 
-@implementation SSKeychain
+@implementation SPKeychain
 
 + (NSString *)passwordForService:(NSString *)serviceName account:(NSString *)account {
 	return [self passwordForService:serviceName account:account error:nil];
 }
 
 
 + (NSString *)passwordForService:(NSString *)serviceName account:(NSString *)account error:(NSError *__autoreleasing *)error {
-	SSKeychainQuery *query = [[SSKeychainQuery alloc] init];
+	SPKeychainQuery *query = [[SPKeychainQuery alloc] init];
 	query.service = serviceName;
 	query.account = account;
 	[query fetch:error];
@@ -43,7 +43,7 @@ + (BOOL)deletePasswordForService:(NSString *)serviceName account:(NSString *)acc
 
 
 + (BOOL)deletePasswordForService:(NSString *)serviceName account:(NSString *)account error:(NSError *__autoreleasing *)error {
-	SSKeychainQuery *query = [[SSKeychainQuery alloc] init];
+	SPKeychainQuery *query = [[SPKeychainQuery alloc] init];
 	query.service = serviceName;
 	query.account = account;
 	return [query deleteItem:error];
@@ -56,7 +56,7 @@ + (BOOL)setPassword:(NSString *)password forService:(NSString *)serviceName acco
 
 
 + (BOOL)setPassword:(NSString *)password forService:(NSString *)serviceName account:(NSString *)account error:(NSError *__autoreleasing *)error {
-	SSKeychainQuery *query = [[SSKeychainQuery alloc] init];
+	SPKeychainQuery *query = [[SPKeychainQuery alloc] init];
 	query.service = serviceName;
 	query.account = account;
 	query.password = password;
@@ -70,7 +70,7 @@ + (NSArray *)allAccounts {
 
 
 + (NSArray *)accountsForService:(NSString *)serviceName {
-	SSKeychainQuery *query = [[SSKeychainQuery alloc] init];
+	SPKeychainQuery *query = [[SPKeychainQuery alloc] init];
 	query.service = serviceName;
 	return [query fetchAll:nil];
 }

External/SSKeychain/SSKeychainQuery.h → External/SSKeychain/SPKeychainQuery.h

@@ -15,17 +15,17 @@
 #endif
 
 #ifdef SSKEYCHAIN_SYNCHRONIZATION_AVAILABLE
-typedef NS_ENUM(NSUInteger, SSKeychainQuerySynchronizationMode) {
-	SSKeychainQuerySynchronizationModeAny,
-	SSKeychainQuerySynchronizationModeNo,
-	SSKeychainQuerySynchronizationModeYes
+typedef NS_ENUM(NSUInteger, SPKeychainQuerySynchronizationMode) {
+	SPKeychainQuerySynchronizationModeAny,
+	SPKeychainQuerySynchronizationModeNo,
+	SPKeychainQuerySynchronizationModeYes
 };
 #endif
 
 /**
  Simple interface for querying or modifying keychain items.
  */
-@interface SSKeychainQuery : NSObject
+@interface SPKeychainQuery : NSObject
 
 /** kSecAttrAccount */
 @property (nonatomic, copy) NSString *account;
@@ -43,7 +43,7 @@ typedef NS_ENUM(NSUInteger, SSKeychainQuerySynchronizationMode) {
 
 #ifdef SSKEYCHAIN_SYNCHRONIZATION_AVAILABLE
 /** kSecAttrSynchronizable */
-@property (nonatomic) SSKeychainQuerySynchronizationMode synchronizationMode;
+@property (nonatomic) SPKeychainQuerySynchronizationMode synchronizationMode;
 #endif
 
 /** Root storage for password information */

External/SSKeychain/SSKeychainQuery.m → External/SSKeychain/SPKeychainQuery.m

@@ -6,10 +6,10 @@
 //  Copyright (c) 2013-2014 Sam Soffes. All rights reserved.
 //
 
-#import "SSKeychainQuery.h"
-#import "SSKeychain.h"
+#import "SPKeychainQuery.h"
+#import "SPKeychain.h"
 
-@implementation SSKeychainQuery
+@implementation SPKeychainQuery
 
 @synthesize account = _account;
 @synthesize service = _service;
@@ -27,7 +27,7 @@ @implementation SSKeychainQuery
 #pragma mark - Public
 
 - (BOOL)save:(NSError *__autoreleasing *)error {
-	OSStatus status = SSKeychainErrorBadArguments;
+	OSStatus status = SPKeychainErrorBadArguments;
 	if (!self.service || !self.account || !self.passwordData) {
 		if (error) {
 			*error = [[self class] errorWithCode:status];
@@ -43,7 +43,7 @@ - (BOOL)save:(NSError *__autoreleasing *)error {
 		[query setObject:self.label forKey:(__bridge id)kSecAttrLabel];
 	}
 #if __IPHONE_4_0 && TARGET_OS_IPHONE
-	CFTypeRef accessibilityType = [SSKeychain accessibilityType];
+	CFTypeRef accessibilityType = [SPKeychain accessibilityType];
 	if (accessibilityType) {
 		[query setObject:(__bridge id)accessibilityType forKey:(__bridge id)kSecAttrAccessible];
 	}
@@ -59,7 +59,7 @@ - (BOOL)save:(NSError *__autoreleasing *)error {
 
 
 - (BOOL)deleteItem:(NSError *__autoreleasing *)error {
-	OSStatus status = SSKeychainErrorBadArguments;
+	OSStatus status = SPKeychainErrorBadArguments;
 	if (!self.service || !self.account) {
 		if (error) {
 			*error = [[self class] errorWithCode:status];
@@ -89,7 +89,7 @@ - (BOOL)deleteItem:(NSError *__autoreleasing *)error {
 
 
 - (NSArray *)fetchAll:(NSError *__autoreleasing *)error {
-	OSStatus status = SSKeychainErrorBadArguments;
+	OSStatus status = SPKeychainErrorBadArguments;
 	NSMutableDictionary *query = [self query];
 	[query setObject:@YES forKey:(__bridge id)kSecReturnAttributes];
 	[query setObject:(__bridge id)kSecMatchLimitAll forKey:(__bridge id)kSecMatchLimit];
@@ -106,7 +106,7 @@ - (NSArray *)fetchAll:(NSError *__autoreleasing *)error {
 
 
 - (BOOL)fetch:(NSError *__autoreleasing *)error {
-	OSStatus status = SSKeychainErrorBadArguments;
+	OSStatus status = SPKeychainErrorBadArguments;
 	if (!self.service || !self.account) {
 		if (error) {
 			*error = [[self class] errorWithCode:status];
@@ -198,15 +198,15 @@ - (NSMutableDictionary *)query {
 		id value;
 
 		switch (self.synchronizationMode) {
-			case SSKeychainQuerySynchronizationModeNo: {
+			case SPKeychainQuerySynchronizationModeNo: {
 			  value = @NO;
 			  break;
 			}
-			case SSKeychainQuerySynchronizationModeYes: {
+			case SPKeychainQuerySynchronizationModeYes: {
 			  value = @YES;
 			  break;
 			}
-			case SSKeychainQuerySynchronizationModeAny: {
+			case SPKeychainQuerySynchronizationModeAny: {
 			  value = (__bridge id)(kSecAttrSynchronizableAny);
 			  break;
 			}
@@ -224,7 +224,7 @@ + (NSError *)errorWithCode:(OSStatus) code {
 	NSString *message = nil;
 	switch (code) {
 		case errSecSuccess: return nil;
-		case SSKeychainErrorBadArguments: message = NSLocalizedStringFromTable(@"SSKeychainErrorBadArguments", @"SSKeychain", nil); break;
+		case SPKeychainErrorBadArguments: message = NSLocalizedStringFromTable(@"SPKeychainErrorBadArguments", @"SSKeychain", nil); break;
 
 #if TARGET_OS_IPHONE
 		case errSecUnimplemented: {
@@ -276,7 +276,7 @@ + (NSError *)errorWithCode:(OSStatus) code {
 	if (message) {
 		userInfo = @{ NSLocalizedDescriptionKey : message };
 	}
-	return [NSError errorWithDomain:kSSKeychainErrorDomain code:code userInfo:userInfo];
+	return [NSError errorWithDomain:kSPKeychainErrorDomain code:code userInfo:userInfo];
 }
 
 @end