Added support to read multiple public keys from a PEM file #22
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -220,6 +220,57 @@ public class SwiftyRSA: NSObject { | |||
| return try addKey(data, isPublic: false) | |||
| } | |||
|
|
|||
| /// The regular expression used to find public key armor | |||
| let publicKeyRegexp : NSRegularExpression! = { | |||
There was a problem hiding this comment.
Love the caching of the regex here. However we should avoid forced-unwraps at all costs. Can you make publicKeyRegexp an optional, and guard it in publicKeysFromString?
|
@greenantdotcom Thanks a lot! This is great. Added a couple comments inline. Can you also update the CHANGELOG.md so we keep track of changes? Thank you. |
greenantdotcom
force-pushed
the
convenience-pub-key-reading
branch
from
defe8aa to
db67bdb
Compare
For a usecase where we may have multiple public keys that our content might have been signed with, we wanted to put multiple public keys into a single file, much like you may have multiple SSL certs in a chain file. This method parses out any data between `-----BEGIN PUBLIC KEY-----` and `-----END PUBLIC KEY-----`, and then uses `publicKeyFromPEMString` to try to parse it. Tests added for a really insane usecases, an empty string, and reading one of the test private keys for fun. All added code has 100% coverage, and the new method is commented.
greenantdotcom
force-pushed
the
convenience-pub-key-reading
branch
from
db67bdb to
1aa9a06
Compare
|
@ldiqual Should be done! |
|
@greenantdotcom Perfect! I'm merging this now. Thank you so much for implementing this. I've sent you an invite to join the SwiftyRSA maintainers group -- no pressure to accept! Feel free to get back to me if you have any question. |
ldiqual
added a commit
that referenced
this pull request
Sep 15, 2016
* Make SwiftyRSA compile with Swift 3.0 * Fixed all errors + warnings * Fix spelling * Added support to read multiple public keys from a PEM file (#22) For a usecase where we may have multiple public keys that our content might have been signed with, we wanted to put multiple public keys into a single file, much like you may have multiple SSL certs in a chain file. This method parses out any data between `-----BEGIN PUBLIC KEY-----` and `-----END PUBLIC KEY-----`, and then uses `publicKeyFromPEMString` to try to parse it. Tests added for a really insane usecases, an empty string, and reading one of the test private keys for fun. All added code has 100% coverage, and the new method is commented. * Added targets for watchOS and tvOS (#23) - Added additional targets for watchOS and tvOS platforms - Tests pass on tvOS - Changed the master `SwiftyRSA.h` file to pull in Foundation and not UIKit/Cocoa since those frameworks aren't needed - The current CI pipeline doesn't assume multiple targets/schemes, so I refactored `.travis.yml` to allow for AppleTV, iOS, and watchOS targets, and based on how Alamofire does theirs for multiple platform support - Updated `podspec` to show multiple platform support - Also raised iOS version to 8.3 since Travis platform doesn't seem to have support for iOS 8.0-8.2 * Updated changelog * Bump to 0.4.0 * Update to Xcode 8.0 beta 4 * Migrate to Xcode 8 beta 6 * Don't reduce maximum block size when padding is `none` Closes #29 * Update CHANGELOG.md #29 * Fix OSStatus -34018 on iOS 10 * Update travis to support xcode 8
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For a usecase where we may have multiple public keys that our content might have been signed with, we wanted to put multiple public keys into a single file, much like you may have multiple SSL certs in a chain file.
This method parses out any data between
-----BEGIN PUBLIC KEY-----and-----END PUBLIC KEY-----, and then usespublicKeyFromPEMString()to try to parse it.Tests added for a really insane usecases, an empty string, and reading one of the test private keys for fun. All added code has 100% coverage, and the new method is commented.