diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2018-10-23 10:56:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-23 10:56:52 -0400 |
| commit | 238c512d203d22e93b2c30630b12f4269175bb85 (patch) | |
| tree | 0af897d773709df39312f34505a3490e428160b4 /xcode/OLMKit/OLMPkDecryption.m | |
| parent | 1aafac2874affafd8c8fc7e3022c6ca6d2d078d6 (diff) | |
| parent | c0d118f407ee2b0956bad2cccb5e61e6c472d533 (diff) | |
Merge pull request #75 from matrix-org/manuroe/objc_pk_private_key_length
OLMKit: Expose PK private key length
Diffstat (limited to 'xcode/OLMKit/OLMPkDecryption.m')
| -rw-r--r-- | xcode/OLMKit/OLMPkDecryption.m | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/xcode/OLMKit/OLMPkDecryption.m b/xcode/OLMKit/OLMPkDecryption.m index 75fe5f2..4af2c71 100644 --- a/xcode/OLMKit/OLMPkDecryption.m +++ b/xcode/OLMKit/OLMPkDecryption.m @@ -130,7 +130,7 @@ return privateKey; } --(NSString *)decryptMessage:(OLMPkMessage *)message error:(NSError *__autoreleasing _Nullable *)error { +- (NSString *)decryptMessage:(OLMPkMessage *)message error:(NSError *__autoreleasing _Nullable *)error { NSData *messageData = [message.ciphertext dataUsingEncoding:NSUTF8StringEncoding]; NSData *macData = [message.mac dataUsingEncoding:NSUTF8StringEncoding]; NSData *ephemeralKeyData = [message.ephemeralKey dataUsingEncoding:NSUTF8StringEncoding]; @@ -189,6 +189,10 @@ return plaintext; } ++ (NSUInteger)privateKeyLength { + return olm_pk_private_key_length(); +} + #pragma mark OLMSerializable /** Initializes from encrypted serialized data. Will throw error if invalid key or invalid base64. */ |