From da1f1fd582cbf074ea937d113d0d94d316d0a92d Mon Sep 17 00:00:00 2001 From: Max Radermacher Date: Sun, 24 Sep 2023 20:21:32 -0500 Subject: [PATCH] Remove some unused code --- SignalCoreKit/src/Cryptography.h | 2 - SignalCoreKit/src/Cryptography.m | 9 --- SignalCoreKit/src/Cryptography.swift | 46 ------------- SignalCoreKit/src/OWSAsserts.h | 2 - SignalCoreKit/src/OWSAsserts.m | 5 -- SignalCoreKit/src/OWSDataParser.swift | 69 ------------------- SignalCoreKit/src/OWSSwiftUtils.swift | 10 +-- .../src/OWSDataParserTests.swift | 57 --------------- 8 files changed, 5 insertions(+), 195 deletions(-) delete mode 100644 SignalCoreKit/src/OWSDataParser.swift delete mode 100644 SignalCoreKitTests/src/OWSDataParserTests.swift diff --git a/SignalCoreKit/src/Cryptography.h b/SignalCoreKit/src/Cryptography.h index bbef8a5..924ef13 100644 --- a/SignalCoreKit/src/Cryptography.h +++ b/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 - diff --git a/SignalCoreKit/src/Cryptography.m b/SignalCoreKit/src/Cryptography.m index f9dc2f6..52a4761 100644 --- a/SignalCoreKit/src/Cryptography.m +++ b/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); diff --git a/SignalCoreKit/src/Cryptography.swift b/SignalCoreKit/src/Cryptography.swift index 5597529..2bb47c2 100644 --- a/SignalCoreKit/src/Cryptography.swift +++ b/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 diff --git a/SignalCoreKit/src/OWSAsserts.h b/SignalCoreKit/src/OWSAsserts.h index 7dda644..a026248 100644 --- a/SignalCoreKit/src/OWSAsserts.h +++ b/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 diff --git a/SignalCoreKit/src/OWSAsserts.m b/SignalCoreKit/src/OWSAsserts.m index 0abf981..513e166 100644 --- a/SignalCoreKit/src/OWSAsserts.m +++ b/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 diff --git a/SignalCoreKit/src/OWSDataParser.swift b/SignalCoreKit/src/OWSDataParser.swift deleted file mode 100644 index c013df4..0000000 --- a/SignalCoreKit/src/OWSDataParser.swift +++ /dev/null @@ -1,69 +0,0 @@ -// -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. -// - -import Foundation - -public enum OWSDataParserError: Error { - case overflow(description : String) -} - -// MARK: - OWSDataParser - -@objc -public class OWSDataParser: NSObject { - - private let data: Data - private var cursor: UInt = 0 - - @objc - public var unreadByteCount: UInt { - UInt(data.count) - cursor - } - - @objc - public init(data: Data) { - self.data = data - } - - @objc - public func nextData(length: UInt, name: String? = nil) throws -> Data { - guard cursor + length <= data.count else { - guard let name = name else { - throw OWSDataParserError.overflow(description: "\(logTag) invalid data read") - } - throw OWSDataParserError.overflow(description: "\(logTag) invalid data read: \(name)") - } - - let endIndex = cursor + length - let result = data.subdata(in: Int(cursor).. UInt8 { - let subdata = try nextData(length: 1, name: name) - return subdata[0] - } - - @objc - public func remainder(name: String? = nil) throws -> Data { - return try nextData(length: UInt(data.count) - cursor, name: name) - } - - @objc - public var isEmpty: Bool { - return data.count == cursor - } -} diff --git a/SignalCoreKit/src/OWSSwiftUtils.swift b/SignalCoreKit/src/OWSSwiftUtils.swift index e6426f2..83aeb2b 100644 --- a/SignalCoreKit/src/OWSSwiftUtils.swift +++ b/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")) } diff --git a/SignalCoreKitTests/src/OWSDataParserTests.swift b/SignalCoreKitTests/src/OWSDataParserTests.swift deleted file mode 100644 index 93a55c9..0000000 --- a/SignalCoreKitTests/src/OWSDataParserTests.swift +++ /dev/null @@ -1,57 +0,0 @@ -// -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. -// - -import Foundation -import XCTest -import SignalCoreKit - -class OWSDataParserTests: XCTestCase { - - func testDataParser1() { - let someBytes: [UInt8] = [ 1, 2, 3, 4, 5, 6, 7, 8 ] - let someData = NSData(bytes: someBytes, length: someBytes.count) as Data - let dataParser = OWSDataParser(data: someData) - - XCTAssertEqual(dataParser.unreadByteCount, 8) - XCTAssertFalse(dataParser.isEmpty) - - XCTAssertEqual(try dataParser.nextByte(), 1) - XCTAssertEqual(dataParser.unreadByteCount, 7) - XCTAssertFalse(dataParser.isEmpty) - - XCTAssertEqual(try dataParser.nextByte(), 2) - XCTAssertEqual(dataParser.unreadByteCount, 6) - XCTAssertFalse(dataParser.isEmpty) - - XCTAssertEqual(try dataParser.nextByte(), 3) - XCTAssertEqual(dataParser.unreadByteCount, 5) - XCTAssertFalse(dataParser.isEmpty) - } - - func testDataParser2() { - let someBytes: [UInt8] = [ 1, 2, 3, 4, 5, 6, 7, 8 ] - let someData = NSData(bytes: someBytes, length: someBytes.count) as Data - let dataParser = OWSDataParser(data: someData) - - XCTAssertEqual(dataParser.unreadByteCount, 8) - XCTAssertFalse(dataParser.isEmpty) - - do { - let readData = try dataParser.nextData(length: 8) - XCTAssertEqual(someData, readData) - XCTAssertEqual(dataParser.unreadByteCount, 0) - XCTAssertTrue(dataParser.isEmpty) - } catch { - XCTFail("Error: \(error)") - return - } - - do { - _ = try dataParser.nextByte() - XCTFail("Read should have failed.") - } catch { - // This error is expected. - } - } -}