Skip to content
This repository has been archived by the owner on Aug 24, 2019. It is now read-only.

Commit

Permalink
Merge pull request #143 from kolyuchiy/fix-name-clash2
Browse files Browse the repository at this point in the history
Fix name clash
  • Loading branch information
soffes authored Jul 26, 2016
2 parents 4fcac2c + 4129341 commit c8a4c57
Show file tree
Hide file tree
Showing 13 changed files with 353 additions and 353 deletions.
28 changes: 14 additions & 14 deletions Readme.markdown
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
# SSKeychain
# SAMKeychain

SSKeychain is a simple wrapper for accessing accounts, getting passwords, setting passwords, and deleting passwords using the system Keychain on Mac OS X and iOS.
SAMKeychain is a simple wrapper for accessing accounts, getting passwords, setting passwords, and deleting passwords using the system Keychain on Mac OS X and iOS.

## Adding to Your Project

Simply add the following to your Podfile if you're using CocoaPods:

``` ruby
pod 'SSKeychain'
pod 'SAMKeychain'
```

or Cartfile if you're using Carthage:

```
github "soffes/SSKeychain"
github "soffes/SAMKeychain"
```

To manually add to your project:

1. Add `Security.framework` to your target
2. Add `SSKeychain.h`, `SSKeychain.m`, `SSKeychainQuery.h`, and `SSKeychainQuery.m` to your project.
2. Add `SAMKeychain.h`, `SAMKeychain.m`, `SAMKeychainQuery.h`, and `SAMKeychainQuery.m` to your project.

SSKeychain requires ARC.
SAMKeychain requires ARC.

Note: Currently SSKeychain does not support Mac OS 10.6.
Note: Currently SAMKeychain does not support Mac OS 10.6.

## Working with the Keychain

SSKeychain has the following class methods for working with the system keychain:
SAMKeychain has the following class methods for working with the system keychain:

```objective-c
+ (NSArray *)allAccounts;
Expand All @@ -38,22 +38,22 @@ SSKeychain has the following class methods for working with the system keychain:
+ (BOOL)setPassword:(NSString *)password forService:(NSString *)serviceName account:(NSString *)account;
```

Easy as that. (See [SSKeychain.h](https://github.com/soffes/sskeychain/blob/master/SSKeychain/SSKeychain.h) and [SSKeychainQuery.h](https://github.com/soffes/sskeychain/blob/master/SSKeychain/SSKeychainQuery.h) for all of the methods.)
Easy as that. (See [SAMKeychain.h](https://github.com/soffes/samkeychain/blob/master/Sources/SAMKeychain.h) and [SAMKeychainQuery.h](https://github.com/soffes/samkeychain/blob/master/Sources/SAMKeychainQuery.h) for all of the methods.)


## Documentation

### Use prepared documentation

Read the [online documentation](http://cocoadocs.org/docsets/SSKeychain).
Read the [online documentation](http://cocoadocs.org/docsets/SAMKeychain).

## Debugging

If your saving to the keychain fails, use the NSError object to handle it. You can invoke `[error code]` to get the numeric error code. A few values are defined in SSKeychain.h, and the rest in SecBase.h.
If your saving to the keychain fails, use the NSError object to handle it. You can invoke `[error code]` to get the numeric error code. A few values are defined in SAMKeychain.h, and the rest in SecBase.h.

```objective-c
NSError *error = nil;
SSKeychainQuery *query = [[SSKeychainQuery alloc] init];
SAMKeychainQuery *query = [[SAMKeychainQuery alloc] init];
query.service = @"MyService";
query.account = @"soffes";
[query fetch:&error];
Expand All @@ -78,6 +78,6 @@ for other options.
## Thanks
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).
This was originally inspired by EMKeychain and SDKeychain (both of which are now gone). Thanks to the authors. SAMKeychain has since switched to a simpler implementation that was abstracted from [SSToolkit](http://sstoolk.it).
A huge thanks to [Caleb Davenport](https://github.com/calebd) for leading the way on version 1.0 of SSKeychain.
A huge thanks to [Caleb Davenport](https://github.com/calebd) for leading the way on version 1.0 of SAMKeychain.
8 changes: 4 additions & 4 deletions SSKeychain.podspec → SAMKeychain.podspec
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
Pod::Spec.new do |spec|
spec.name = 'SSKeychain'
spec.name = 'SAMKeychain'
spec.version = '1.4.0'
spec.description = 'Simple Cocoa wrapper for the keychain that works on OS X, iOS, tvOS, and watchOS.'
spec.summary = 'Simple Cocoa wrapper for the keychain.'
spec.homepage = 'https://github.com/soffes/sskeychain'
spec.homepage = 'https://github.com/soffes/samkeychain'
spec.author = { 'Sam Soffes' => '[email protected]' }
spec.source = { :git => 'https://github.com/soffes/sskeychain.git', :tag => "v#{spec.version}" }
spec.source = { :git => 'https://github.com/soffes/samkeychain.git', :tag => "v#{spec.version}" }
spec.license = { :type => 'MIT', :file => 'LICENSE' }

spec.source_files = 'Sources/*.{h,m}'
spec.resources = 'Support/SSKeychain.bundle'
spec.resources = 'Support/SAMKeychain.bundle'

spec.frameworks = 'Security', 'Foundation'

Expand Down
Loading

0 comments on commit c8a4c57

Please sign in to comment.