From e9bbbe4c87c896b49f1305cc3cad894f06e5e3f7 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Wed, 2 Oct 2019 14:23:00 +1000 Subject: [PATCH] Fix typo --- .../src/Loki/API/Group Chat/LokiGroupMessage.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SignalServiceKit/src/Loki/API/Group Chat/LokiGroupMessage.swift b/SignalServiceKit/src/Loki/API/Group Chat/LokiGroupMessage.swift index bfbf23ea7..4329c9a03 100644 --- a/SignalServiceKit/src/Loki/API/Group Chat/LokiGroupMessage.swift +++ b/SignalServiceKit/src/Loki/API/Group Chat/LokiGroupMessage.swift @@ -63,7 +63,7 @@ public final class LokiGroupMessage : NSObject { // MARK: Crypto internal func sign(with privateKey: Data) -> LokiGroupMessage? { - guard let data = getValidationData() else { + guard let data = getValidationData(for: signatureVersion) else { print("[Loki] Failed to sign group chat message.") return nil } @@ -78,7 +78,7 @@ public final class LokiGroupMessage : NSObject { internal func hasValidSignature() -> Bool { guard let signature = signature else { return false } - guard let data = getValidationData() else { return false } + guard let data = getValidationData(for: signature.version) else { return false } return (try? Ed25519.verifySignature(signature.data, publicKey: Data(hex: hexEncodedPublicKey), data: data)) ?? false } @@ -101,7 +101,7 @@ public final class LokiGroupMessage : NSObject { } // MARK: Convenience - private func getValidationData() -> Data? { + private func getValidationData(for signatureVersion: UInt64) -> Data? { var string = "\(body.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines))\(timestamp)" if let quote = quote { string += "\(quote.quotedMessageTimestamp)\(quote.quoteeHexEncodedPublicKey)\(quote.quotedMessageBody.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines))"