Remove some unused code

SignalCoreKit/src/Cryptography.h

@@ -37,9 +37,7 @@ typedef NS_ENUM(NSInteger, TSMACType) {
 
 + (NSData *)generateRandomBytes:(NSUInteger)numberBytes;
 
-+ (uint32_t)randomUInt32;
 + (uint64_t)randomUInt64;
-+ (unsigned)randomUnsigned;
 
 #pragma mark -
 

SignalCoreKit/src/Cryptography.m

@@ -102,15 +102,6 @@ + (NSData *)generateRandomBytes:(NSUInteger)numberBytes
     return [Randomness generateRandomBytes:(int)numberBytes];
 }
 
-+ (uint32_t)randomUInt32
-{
-    size_t size = sizeof(uint32_t);
-    NSData *data = [self generateRandomBytes:size];
-    uint32_t result = 0;
-    [data getBytes:&result range:NSMakeRange(0, size)];
-    return result;
-}
-
 + (uint64_t)randomUInt64
 {
     size_t size = sizeof(uint64_t);

SignalCoreKit/src/Cryptography.swift

@@ -6,52 +6,6 @@ import Foundation
 import CommonCrypto
 
 public extension Cryptography {
-    class func pbkdf2Derivation(password: Data, salt: Data, iterations: UInt32, outputLength: Int) -> Data? {
-        guard password.count > 0 else {
-            owsFailDebug("Invalid password.")
-            return nil
-        }
-
-        guard salt.count > 0 else {
-            owsFailDebug("Invalid salt.")
-            return nil
-        }
-
-        guard iterations > 0 else {
-            owsFailDebug("Invalid iterations.")
-            return nil
-        }
-
-        guard outputLength > 0 else {
-            owsFailDebug("Invalid outputLength.")
-            return nil
-        }
-
-        let passwordBytes: [Int8] = password.withUnsafeBytes {
-            [Int8]($0.bindMemory(to: Int8.self))
-        }
-        let saltBytes: [UInt8] = salt.withUnsafeBytes { [UInt8]($0) }
-        var outputBytes = [UInt8](repeating: 0, count: outputLength)
-        let status = CCKeyDerivationPBKDF(
-            CCPBKDFAlgorithm(kCCPBKDF2),
-            passwordBytes,
-            passwordBytes.count,
-            saltBytes,
-            saltBytes.count,
-            CCPBKDFAlgorithm(kCCPRFHmacAlgSHA256),
-            iterations,
-            &outputBytes,
-            outputBytes.count
-        )
-
-        guard status == noErr else {
-            owsFailDebug("Unexpected status: \(status)")
-            return nil
-        }
-
-        return Data(outputBytes)
-    }
-
     // MARK: - HMAC-SIV
 
     private static let hmacsivIVLength = 16

SignalCoreKit/src/OWSAsserts.h

@@ -219,6 +219,4 @@ __attribute__((annotate("returns_localized_nsstring"))) static inline NSString *
         OWSAssert(!_didOverflow);                                                                                      \
     } while (NO)
 
-void LogStackTrace(void);
-
 NS_ASSUME_NONNULL_END

SignalCoreKit/src/OWSAsserts.m

@@ -14,9 +14,4 @@ void SwiftExit(NSString *message, const char *file, const char *function, int li
     [OWSSwiftUtils owsFail:message file:_file function:_function line:line];
 }
 
-void LogStackTrace()
-{
-    [OWSSwiftUtils logStackTrace];
-}
-
 NS_ASSUME_NONNULL_END

SignalCoreKit/src/OWSSwiftUtils.swift

@@ -49,7 +49,7 @@ public func owsFail(_ logMessage: String,
                     file: String = #file,
                     function: String = #function,
                     line: Int = #line) -> Never {
-    OWSSwiftUtils.logStackTrace()
+    logStackTrace()
     owsFailDebug(logMessage, file: file, function: function, line: line)
     let formattedMessage = owsFormatLogMessage(logMessage, file: file, function: function, line: line)
     fatalError(formattedMessage)
@@ -96,8 +96,8 @@ public class OWSSwiftUtils: NSObject {
         fatalError(formattedMessage)
     }
 
-    @objc
-    public class func logStackTrace() {
-        Thread.callStackSymbols.forEach { Logger.error($0) }
-    }
+}
+
+public func logStackTrace() {
+    Logger.error(Thread.callStackSymbols.joined(separator: "\n"))
 }