provisioning cipher: Fix memory leak, handle failure

Explicitly malloc'd buffer should either be explicitly free'd or
ownership given to NSData via `freeWhenDone:YES`

Instead I opted to avoid the explict malloc altogether, and avoided some
unnecessary allocations.

Also made sure encryption failures propogate to error handler

// FREEBIE

SignalServiceKit/src/Devices/OWSDeviceProvisioner.m

@@ -1,9 +1,12 @@
-//  Copyright © 2016 Open Whisper Systems. All rights reserved.
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
 
 #import "OWSDeviceProvisioner.h"
 #import "OWSDeviceProvisioningCodeService.h"
 #import "OWSDeviceProvisioningService.h"
 #import "OWSProvisioningMessage.h"
+#import "OWSError.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -88,7 +91,14 @@ NS_ASSUME_NONNULL_BEGIN
                                                                                profileKey:self.profileKey
                                                                          provisioningCode:provisioningCode];
 
-    [self.provisioningService provisionWithMessageBody:[message buildEncryptedMessageBody]
+    NSData *_Nullable messageBody = [message buildEncryptedMessageBody];
+    if (messageBody == nil) {
+        NSError *error = OWSErrorWithCodeDescription(OWSErrorCodeFailedToEncryptMessage, @"Failed building provisioning message");
+        failureCallback(error);
+        return;
+    }
+    
+    [self.provisioningService provisionWithMessageBody:messageBody
         ephemeralDeviceId:self.ephemeralDeviceId
         success:^{
             DDLogInfo(@"ProvisioningService SUCCEEDED");

SignalServiceKit/src/Devices/OWSProvisioningCipher.h

@@ -1,4 +1,6 @@
-//  Copyright © 2016 Open Whisper Systems. All rights reserved.
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -7,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, readonly) NSData *ourPublicKey;
 
 - (instancetype)initWithTheirPublicKey:(NSData *)theirPublicKey;
-- (NSData *)encrypt:(NSData *)plainText;
+- (nullable NSData *)encrypt:(NSData *)plainText;
 
 @end
 

SignalServiceKit/src/Devices/OWSProvisioningCipher.m

@@ -22,11 +22,11 @@ NS_ASSUME_NONNULL_BEGIN
 - (instancetype)initWithTheirPublicKey:(NSData *)theirPublicKey
 {
     return [self initWithTheirPublicKey:theirPublicKey
-                           ourKeyPair:[Curve25519 generateKeyPair]
+                             ourKeyPair:[Curve25519 generateKeyPair]
                    initializationVector:[Cryptography generateRandomBytes:kCCBlockSizeAES128]];
 }
 
-    
+// Private method which exposes dependencies for testing
 - (instancetype)initWithTheirPublicKey:(NSData *)theirPublicKey
                             ourKeyPair:(ECKeyPair *)ourKeyPair
                   initializationVector:(NSData *)initializationVector
@@ -48,7 +48,7 @@ NS_ASSUME_NONNULL_BEGIN
     return self.ourKeyPair.publicKey;
 }
 
-- (NSData *)encrypt:(NSData *)dataToEncrypt
+- (nullable NSData *)encrypt:(NSData *)dataToEncrypt
 {
     NSData *sharedSecret =
         [Curve25519 generateSharedSecretFromPublicKey:self.theirPublicKey andKeyPair:self.ourKeyPair];
@@ -64,7 +64,12 @@ NS_ASSUME_NONNULL_BEGIN
     u_int8_t versionByte[] = { 0x01 };
     NSMutableData *message = [NSMutableData dataWithBytes:&versionByte length:1];
 
-    NSData *cipherText = [self encrypt:dataToEncrypt withKey:cipherKey];
+    NSData *_Nullable cipherText = [self encrypt:dataToEncrypt withKey:cipherKey];
+    if (cipherText == nil) {
+        OWSFail(@"Provisioning cipher failed.");
+        return nil;
+    }
+    
     [message appendData:cipherText];
 
     NSData *mac = [self macForMessage:message withKey:macKey];
@@ -73,14 +78,27 @@ NS_ASSUME_NONNULL_BEGIN
     return [message copy];
 }
 
-- (NSData *)encrypt:(NSData *)dataToEncrypt withKey:(NSData *)cipherKey
+- (nullable NSData *)encrypt:(NSData *)dataToEncrypt withKey:(NSData *)cipherKey
 {
     NSData *iv = self.initializationVector;
-    OWSAssert(iv.length == kCCBlockSizeAES128);
+    if (iv.length != kCCBlockSizeAES128) {
+        OWSFail(@"Unexpected length for iv");
+        return nil;
+    }
 
     // allow space for message + padding any incomplete block
-    size_t bufferSize = dataToEncrypt.length + kCCBlockSizeAES128;
-    void *buffer = malloc(bufferSize);
+    NSUInteger blockCount = ceil((double)dataToEncrypt.length / (double)kCCBlockSizeAES128);
+    size_t ciphertextBufferSize = blockCount * kCCBlockSizeAES128;
+
+    // message format is (iv || ciphertext)
+    NSMutableData *encryptedMessage = [NSMutableData dataWithLength:iv.length + ciphertextBufferSize];
+    
+    // write the iv
+    [encryptedMessage replaceBytesInRange:NSMakeRange(0, iv.length) withBytes:iv.bytes];
+    
+    // cipher text follows iv
+    char *ciphertextBuffer = encryptedMessage.mutableBytes + iv.length;
+
     size_t bytesEncrypted = 0;
 
     CCCryptorStatus cryptStatus = CCCrypt(kCCEncrypt,
@@ -91,26 +109,25 @@ NS_ASSUME_NONNULL_BEGIN
         iv.bytes,
         dataToEncrypt.bytes,
         dataToEncrypt.length,
-        buffer,
-        bufferSize,
+        ciphertextBuffer,
+        ciphertextBufferSize,
         &bytesEncrypted);
 
     if (cryptStatus != kCCSuccess) {
         DDLogError(@"Encryption failed with status: %d", cryptStatus);
+        return nil;
     }
-
-    NSMutableData *encryptedMessage = [[NSMutableData alloc] initWithData:iv];
-    [encryptedMessage appendBytes:buffer length:bytesEncrypted];
-
+    
     return [encryptedMessage copy];
 }
 
 - (NSData *)macForMessage:(NSData *)message withKey:(NSData *)macKey
 {
-    uint8_t hmacBytes[CC_SHA256_DIGEST_LENGTH] = { 0 };
-    CCHmac(kCCHmacAlgSHA256, macKey.bytes, macKey.length, message.bytes, message.length, hmacBytes);
+    NSMutableData *hmac = [NSMutableData dataWithLength:CC_SHA256_DIGEST_LENGTH];
+    
+    CCHmac(kCCHmacAlgSHA256, macKey.bytes, macKey.length, message.bytes, message.length, hmac.mutableBytes);
 
-    return [NSData dataWithBytes:hmacBytes length:CC_SHA256_DIGEST_LENGTH];
+    return [hmac copy];
 }
 
 

SignalServiceKit/src/Devices/OWSProvisioningMessage.h

@@ -1,4 +1,6 @@
-//  Copyright © 2016 Open Whisper Systems. All rights reserved.
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -11,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
                          profileKey:(NSData *)profileKey
                    provisioningCode:(NSString *)provisioningCode;
 
-- (NSData *)buildEncryptedMessageBody;
+- (nullable NSData *)buildEncryptedMessageBody;
 
 @end
 

SignalServiceKit/src/Devices/OWSProvisioningMessage.m

@@ -1,4 +1,6 @@
-//  Copyright © 2016 Open Whisper Systems. All rights reserved.
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
 
 #import "OWSProvisioningMessage.h"
 #import "OWSProvisioningCipher.h"
@@ -44,7 +46,7 @@ NS_ASSUME_NONNULL_BEGIN
     return self;
 }
 
-- (NSData *)buildEncryptedMessageBody
+- (nullable NSData *)buildEncryptedMessageBody
 {
     OWSProvisioningProtosProvisionMessageBuilder *messageBuilder = [OWSProvisioningProtosProvisionMessageBuilder new];
     [messageBuilder setIdentityKeyPublic:self.myPublicKey];
@@ -57,7 +59,11 @@ NS_ASSUME_NONNULL_BEGIN
     NSData *plainTextProvisionMessage = [[messageBuilder build] data];
 
     OWSProvisioningCipher *cipher = [[OWSProvisioningCipher alloc] initWithTheirPublicKey:self.theirPublicKey];
-    NSData *encryptedProvisionMessage = [cipher encrypt:plainTextProvisionMessage];
+    NSData *_Nullable encryptedProvisionMessage = [cipher encrypt:plainTextProvisionMessage];
+    if (encryptedProvisionMessage == nil) {
+        DDLogError(@"Failed to encrypt provision message");
+        return nil;
+    }
 
     OWSProvisioningProtosProvisionEnvelopeBuilder *envelopeBuilder = [OWSProvisioningProtosProvisionEnvelopeBuilder new];
     // Note that this is a one-time-use *cipher* public key, not our Signal *identity* public key