Clean up.

Pods

@@ -1 +1 @@
-Subproject commit d16f91410fa1d9859a910b6f2b6e2369fb6d0377
+Subproject commit f62516a6d38a44a322bd115f913e83e2941e404f

Signal/src/ViewControllers/DebugUI/DebugUIContacts.m

@@ -7,6 +7,7 @@
 #import "Signal-Swift.h"
 #import "SignalApp.h"
 #import <Contacts/Contacts.h>
+#import <Curve25519Kit/Randomness.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -1351,7 +1352,7 @@ NS_ASSUME_NONNULL_BEGIN
         validRecipientId,
         [TSAccountManager localNumber],
     ] mutableCopy];
-    NSData *groupId = [SecurityUtils generateRandomBytes:16];
+    NSData *groupId = [Randomness generateRandomBytes:16];
     TSGroupModel *model =
         [[TSGroupModel alloc] initWithTitle:groupName memberIds:recipientIds image:nil groupId:groupId];
     TSGroupThread *thread = [TSGroupThread getOrCreateThreadWithGroupModel:model];

Signal/src/ViewControllers/DebugUI/DebugUIMessages.m

@@ -3343,6 +3343,7 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
 + (NSData *)createRandomNSDataOfSize:(size_t)size
 {
     OWSAssert(size % 4 == 0);
+    OWSAssert(size < INT_MAX);
 
     return [Randomness generateRandomBytes:(int)size];
 }
@@ -3833,7 +3834,7 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
         recipientId,
         [TSAccountManager localNumber],
     ] mutableCopy];
-    NSData *groupId = [SecurityUtils generateRandomBytes:16];
+    NSData *groupId = [Randomness generateRandomBytes:16];
     TSGroupModel *groupModel =
         [[TSGroupModel alloc] initWithTitle:groupName memberIds:recipientIds image:nil groupId:groupId];
 
@@ -4324,7 +4325,7 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
                         recipientId,
                         [TSAccountManager localNumber],
                     ] mutableCopy];
-                    NSData *groupId = [SecurityUtils generateRandomBytes:16];
+                    NSData *groupId = [Randomness generateRandomBytes:16];
                     TSGroupModel *groupModel =
                         [[TSGroupModel alloc] initWithTitle:groupName memberIds:recipientIds image:nil groupId:groupId];
 
@@ -4363,7 +4364,7 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
                         recipientId,
                         [TSAccountManager localNumber],
                     ] mutableCopy];
-                    NSData *groupId = [SecurityUtils generateRandomBytes:16];
+                    NSData *groupId = [Randomness generateRandomBytes:16];
                     TSGroupModel *groupModel =
                         [[TSGroupModel alloc] initWithTitle:groupName memberIds:recipientIds image:nil groupId:groupId];
 

Signal/src/ViewControllers/DebugUI/DebugUIMessagesAssetLoader.m

@@ -203,6 +203,7 @@ NS_ASSUME_NONNULL_BEGIN
                         failure:(ActionFailureBlock)failure
 {
     OWSAssert(dataLength > 0);
+    OWSAssert(dataLength < INT_MAX);
     OWSAssert(success);
     OWSAssert(failure);
     OWSAssert(self.filename.length > 0);

Signal/src/ViewControllers/DebugUI/DebugUIMisc.m

@@ -16,7 +16,6 @@
 #import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
 #import <SignalServiceKit/OWSPrimaryStorage+SessionStore.h>
 #import <SignalServiceKit/OWSVerificationStateChangeMessage.h>
-#import <SignalServiceKit/SecurityUtils.h>
 #import <SignalServiceKit/TSCall.h>
 #import <SignalServiceKit/TSInvalidIdentityKeyReceivingErrorMessage.h>
 #import <SignalServiceKit/TSThread.h>

Signal/src/ViewControllers/DebugUI/DebugUIStress.m

@@ -7,12 +7,12 @@
 #import "OWSTableViewController.h"
 #import "SignalApp.h"
 #import "ThreadUtil.h"
+#import <Curve25519Kit/Randomness.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalServiceKit/Cryptography.h>
 #import <SignalServiceKit/NSDate+OWS.h>
 #import <SignalServiceKit/OWSDynamicOutgoingMessage.h>
 #import <SignalServiceKit/OWSPrimaryStorage.h>
-#import <SignalServiceKit/SecurityUtils.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <SignalServiceKit/TSGroupThread.h>
 #import <SignalServiceKit/TSThread.h>
@@ -507,7 +507,7 @@ NS_ASSUME_NONNULL_BEGIN
                 [[TSGroupModel alloc] initWithTitle:[groupThread.groupModel.groupName stringByAppendingString:@" Copy"]
                                           memberIds:groupThread.groupModel.groupMemberIds
                                               image:groupThread.groupModel.groupImage
-                                            groupId:[SecurityUtils generateRandomBytes:16]];
+                                            groupId:[Randomness generateRandomBytes:16]];
             thread = [TSGroupThread getOrCreateThreadWithGroupModel:groupModel transaction:transaction];
         }];
     OWSAssert(thread);

Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m

@@ -22,7 +22,6 @@
 #import <SignalServiceKit/OWSSyncGroupsMessage.h>
 #import <SignalServiceKit/OWSSyncGroupsRequestMessage.h>
 #import <SignalServiceKit/OWSVerificationStateChangeMessage.h>
-#import <SignalServiceKit/SecurityUtils.h>
 #import <SignalServiceKit/TSCall.h>
 #import <SignalServiceKit/TSDatabaseView.h>
 #import <SignalServiceKit/TSIncomingMessage.h>

Signal/src/ViewControllers/NewGroupViewController.m

@@ -8,6 +8,7 @@
 #import "OWSNavigationController.h"
 #import "Signal-Swift.h"
 #import "SignalApp.h"
+#import <Curve25519Kit/Randomness.h>
 #import <SignalMessaging/BlockListUIUtils.h>
 #import <SignalMessaging/ContactTableViewCell.h>
 #import <SignalMessaging/ContactsViewHelper.h>
@@ -21,7 +22,6 @@
 #import <SignalMessaging/UIViewController+OWS.h>
 #import <SignalServiceKit/NSDate+OWS.h>
 #import <SignalServiceKit/OWSMessageSender.h>
-#import <SignalServiceKit/SecurityUtils.h>
 #import <SignalServiceKit/SignalAccount.h>
 #import <SignalServiceKit/TSGroupModel.h>
 #import <SignalServiceKit/TSGroupThread.h>
@@ -507,7 +507,7 @@ const NSUInteger kNewGroupViewControllerAvatarWidth = 68;
     NSString *groupName = [self.groupNameTextField.text ows_stripped];
     NSMutableArray<NSString *> *recipientIds = [self.memberRecipientIds.allObjects mutableCopy];
     [recipientIds addObject:[self.contactsViewHelper localNumber]];
-    NSData *groupId = [SecurityUtils generateRandomBytes:16];
+    NSData *groupId = [Randomness generateRandomBytes:16];
     return [[TSGroupModel alloc] initWithTitle:groupName memberIds:recipientIds image:self.groupAvatar groupId:groupId];
 }
 

Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m

@@ -21,7 +21,6 @@
 #import <SignalMessaging/UIViewController+OWS.h>
 #import <SignalServiceKit/NSDate+OWS.h>
 #import <SignalServiceKit/OWSMessageSender.h>
-#import <SignalServiceKit/SecurityUtils.h>
 #import <SignalServiceKit/SignalAccount.h>
 #import <SignalServiceKit/TSGroupModel.h>
 #import <SignalServiceKit/TSGroupThread.h>

Signal/src/call/SignalCall.swift

@@ -240,8 +240,6 @@ protocol CallObserver: class {
 
 fileprivate extension UInt64 {
     static func ows_random() -> UInt64 {
-        var random: UInt64 = 0
+        return Cryptography.randomUInt64()
-        arc4random_buf(&random, MemoryLayout.size(ofValue: random))
-        return random
     }
 }

Signal/test/ViewControllers/ConversationViewItemTest.m

@@ -6,7 +6,6 @@
 #import <MobileCoreServices/MobileCoreServices.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalServiceKit/MIMETypeUtil.h>
-#import <SignalServiceKit/SecurityUtils.h>
 #import <SignalServiceKit/TSAttachmentStream.h>
 #import <SignalServiceKit/TSContactThread.h>
 #import <SignalServiceKit/TSOutgoingMessage.h>

SignalMessaging/environment/SignalKeyingStorage.m

@@ -3,8 +3,8 @@
 //
 
 #import "SignalKeyingStorage.h"
+#import <Curve25519Kit/Randomness.h>
 #import <SignalServiceKit/OWSPrimaryStorage.h>
-#import <SignalServiceKit/SecurityUtils.h>
 #import <SignalServiceKit/YapDatabaseConnection+OWS.h>
 
 #define SignalKeyingCollection @"SignalKeyingCollection"
@@ -17,9 +17,9 @@
 
 + (void)generateSignaling
 {
-    [self storeData:[SecurityUtils generateRandomBytes:SIGNALING_MAC_KEY_LENGTH] forKey:SIGNALING_MAC_KEY];
+    [self storeData:[Randomness generateRandomBytes:SIGNALING_MAC_KEY_LENGTH] forKey:SIGNALING_MAC_KEY];
-    [self storeData:[SecurityUtils generateRandomBytes:SIGNALING_CIPHER_KEY_LENGTH] forKey:SIGNALING_CIPHER_KEY];
+    [self storeData:[Randomness generateRandomBytes:SIGNALING_CIPHER_KEY_LENGTH] forKey:SIGNALING_CIPHER_KEY];
-    [self storeData:[SecurityUtils generateRandomBytes:SIGNALING_EXTRA_KEY_LENGTH] forKey:SIGNALING_EXTRA_KEY];
+    [self storeData:[Randomness generateRandomBytes:SIGNALING_EXTRA_KEY_LENGTH] forKey:SIGNALING_EXTRA_KEY];
 }
 
 + (int64_t)getAndIncrementOneTimeCounter

SignalMessaging/profiles/OWSProfileManager.m

@@ -20,7 +20,6 @@
 #import <SignalServiceKit/OWSProfileKeyMessage.h>
 #import <SignalServiceKit/OWSRequestBuilder.h>
 #import <SignalServiceKit/OWSSignalService.h>
-#import <SignalServiceKit/SecurityUtils.h>
 #import <SignalServiceKit/TSAccountManager.h>
 #import <SignalServiceKit/TSGroupThread.h>
 #import <SignalServiceKit/TSNetworkManager.h>

SignalServiceKit/src/Account/TSAccountManager.m

@@ -4,6 +4,7 @@
 
 #import "TSAccountManager.h"
 #import "AppContext.h"
+#import "Cryptography.h"
 #import "NSData+Base64.h"
 #import "NSData+OWS.h"
 #import "NSNotificationCenter+OWS.h"
@@ -11,12 +12,12 @@
 #import "OWSError.h"
 #import "OWSPrimaryStorage+SessionStore.h"
 #import "OWSRequestFactory.h"
-#import "SecurityUtils.h"
 #import "TSNetworkManager.h"
 #import "TSPreKeyManager.h"
 #import "TSVerifyCodeRequest.h"
 #import "YapDatabaseConnection+OWS.h"
 #import "YapDatabaseTransaction+OWS.h"
+#import <Curve25519Kit/Randomness.h>
 #import <YapDatabase/YapDatabase.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -432,7 +433,7 @@ NSString *const TSAccountManager_ServerSignalingKey = @"TSStorageServerSignaling
 #pragma mark Server keying material
 
 + (NSString *)generateNewAccountAuthenticationToken {
-    NSData *authToken        = [SecurityUtils generateRandomBytes:16];
+    NSData *authToken = [Randomness generateRandomBytes:16];
     NSString *authTokenPrint = [[NSData dataWithData:authToken] hexadecimalString];
     return authTokenPrint;
 }
@@ -441,7 +442,7 @@ NSString *const TSAccountManager_ServerSignalingKey = @"TSStorageServerSignaling
     /*The signalingKey is 32 bytes of AES material (256bit AES) and 20 bytes of
      * Hmac key material (HmacSHA1) concatenated into a 52 byte slug that is
      * base64 encoded. */
-    NSData *signalingKeyToken        = [SecurityUtils generateRandomBytes:52];
+    NSData *signalingKeyToken = [Randomness generateRandomBytes:52];
     NSString *signalingKeyTokenPrint = [[NSData dataWithData:signalingKeyToken] base64EncodedString];
     return signalingKeyTokenPrint;
 }

SignalServiceKit/src/Security/SecurityUtils.h

@@ -1,9 +0,0 @@
-//
-//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
-//
-
-@interface SecurityUtils : NSObject
-
-+ (NSData *)generateRandomBytes:(NSUInteger)length;
-
-@end

SignalServiceKit/src/Security/SecurityUtils.m

@@ -1,15 +0,0 @@
-//
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
-//
-
-#import "SecurityUtils.h"
-#import <Curve25519Kit/Randomness.h>
-
-@implementation SecurityUtils
-
-+ (NSData *)generateRandomBytes:(NSUInteger)length
-{
-    return [Randomness generateRandomBytes:(int)length];
-}
-
-@end

SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+PreKeyStore.m

@@ -3,6 +3,7 @@
 //
 
 #import "OWSPrimaryStorage+PreKeyStore.h"
+#import "Cryptography.h"
 #import "OWSPrimaryStorage+keyFromIntLong.h"
 #import "TSStorageKeys.h"
 #import "YapDatabaseConnection+OWS.h"

SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SignedPreKeyStore.m

@@ -2,9 +2,10 @@
 //  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSPrimaryStorage+SignedPreKeyStore.h"
+#import "Cryptography.h"
 #import "OWSIdentityManager.h"
 #import "OWSPrimaryStorage+PreKeyStore.h"
-#import "OWSPrimaryStorage+SignedPreKeyStore.h"
 #import "OWSPrimaryStorage+keyFromIntLong.h"
 #import "YapDatabaseConnection+OWS.h"
 #import <AxolotlKit/AxolotlExceptions.h>

SignalServiceKit/src/Util/OWSAnalytics.m

@@ -4,6 +4,7 @@
 
 #import "OWSAnalytics.h"
 #import "AppContext.h"
+#import "Cryptography.h"
 #import "OWSBackgroundTask.h"
 #import "OWSPrimaryStorage.h"
 #import "OWSQueues.h"