Update Themis iOS wrapper for new SecureMessage API (1 Part) #393
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
vixentael
commented
Feb 28, 2019
| self = [super init]; | ||
| if (self) { | ||
| if (!privateKey || [privateKey length] == 0 || !peerPublicKey || [peerPublicKey length] == 0) { | ||
| NSLog(@"Error during init: Secure Message in Encrypt/Decrypt mode requires both private and public keys to be set"); |
|
|
||
| @end | ||
|
|
||
|
|
||
| @implementation TSMessage | ||
|
|
||
| - (nullable instancetype)initInEncryptModeWithPrivateKey:(NSData *)privateKey peerPublicKey:(NSData *)peerPublicKey { | ||
| - (nullable instancetype)initInEncryptModeWithPrivateKey:(nonnull NSData *)privateKey peerPublicKey:(nonnull NSData *)peerPublicKey { |
There was a problem hiding this comment.
use "nonnull" for keys in encrypt/decrypt mode
| @@ -48,10 +49,11 @@ - (nullable instancetype)initInEncryptModeWithPrivateKey:(NSData *)privateKey pe | |||
| } | |||
|
|
|||
|
|
|||
| - (nullable instancetype)initInSignVerifyModeWithPrivateKey:(NSData *)privateKey peerPublicKey:(NSData *)peerPublicKey { | |||
| - (nullable instancetype)initInSignVerifyModeWithPrivateKey:(nullable NSData *)privateKey peerPublicKey:(nullable NSData *)peerPublicKey { | |||
There was a problem hiding this comment.
one key in sign/verify mode might be empty
| result = (TSErrorType) themis_secure_message_wrap([self.privateKey bytes], [self.privateKey length], | ||
| [self.publicKey bytes], [self.publicKey length], [message bytes], [message length], | ||
| NULL, &wrappedMessageLength); | ||
| result = (TSErrorType) themis_secure_message_encrypt([self.privateKey bytes], [self.privateKey length], |
| if (error) { | ||
| *error = SCERROR(TSErrorTypeFail, @"Secure Message failed wraping"); | ||
| } | ||
| NSLog(@"Error during signing: private key is missing"); |
| return nil; | ||
| } | ||
| result = (TSErrorType) themis_secure_message_wrap([self.privateKey bytes], [self.privateKey length], NULL, 0, | ||
| [message bytes], [message length], NULL, &wrappedMessageLength); | ||
| result = (TSErrorType) themis_secure_message_sign([self.privateKey bytes], [self.privateKey length], |
| if (error) { | ||
| *error = SCERROR(result, @"Secure Message failed wraping"); | ||
| } | ||
| NSLog(@"Error during wrapping data: either key is invalid of message is empty"); |
| result = (TSErrorType) themis_secure_message_wrap([self.privateKey bytes], [self.privateKey length], | ||
| [self.publicKey bytes], [self.publicKey length], [message bytes], [message length], | ||
| wrappedMessage, &wrappedMessageLength); | ||
| result = (TSErrorType) themis_secure_message_encrypt([self.privateKey bytes], [self.privateKey length], |
There was a problem hiding this comment.
API change and below
| size_t unwrappedMessageLength = 0; | ||
| TSErrorType result = TSErrorTypeFail; | ||
|
|
||
| switch (self.mode) { |
There was a problem hiding this comment.
a bit of refactoring here – previously this function didn't check the mode, now we do (and check keys)
| result = (TSErrorType) themis_secure_message_unwrap([self.privateKey bytes], [self.privateKey length], | ||
| [self.publicKey bytes], [self.publicKey length], [message bytes], [message length], | ||
| unwrappedMessage, &unwrappedMessageLength); | ||
| switch (self.mode) { |
Lagovas
approved these changes
Feb 28, 2019
Lagovas
reviewed
Feb 28, 2019
| return nil; | ||
| } | ||
| result = (TSErrorType) themis_secure_message_wrap([self.privateKey bytes], [self.privateKey length], NULL, 0, |
There was a problem hiding this comment.
themis_secure_message_wrap wasn't as public method anywhere? only inside wrapData method?
There was a problem hiding this comment.
yes it was used only here
ilammy
approved these changes
Feb 28, 2019
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.
This is first PR of two to update SecureMessage Themis iOS wrapper for new SecureMessage API (#389).
Please check this PR by commits.
Update SecureMessage wrapper to call encrypt/decrypt and sign/verify core functions instead of wrap/unwrap. This change doesn't affect SecureMessage iOS wrapper API itself (users won't notice).
Add more logs for developers about wrong / missing private and public keys.
Fix formatting of the whole Themis iOS wrapper, because it drives me crazy – this commit is about updating style only.
--
In next PR (#394): more tests on SecureMessage iOS wrapper that depends on this PR