signalapp/SignalMetadataKit
signalapp/SignalMetadataKit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'mkirk/typed-protocol-context'

Browse Source
This commit is contained in:
Michael Kirk 2019-05-22 14:58:17 -04:00
commit b2de463ac5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SignalMetadataKit/src/ECPublicKey.swift
View File

@ -43,7 +43,7 @@ import Foundation
@objc public var serialized: Data {
let typeBytes = [ECPublicKey.keyTypeDJB]
let typeData = Data(bytes: typeBytes)
let typeData = Data(typeBytes)
return NSData.join([typeData, keyData])
}

6
SignalMetadataKit/src/SMKSecretSessionCipher.swift
View File

@ -158,7 +158,7 @@ public class SMKDecryptResult: NSObject {
deviceId: Int32,
paddedPlaintext: Data,
senderCertificate: SMKSenderCertificate,
protocolContext: Any?) throws -> Data {
protocolContext: SPKProtocolWriteContext?) throws -> Data {
guard recipientId.count > 0 else {
throw SMKError.assertionError(description: "\(SMKSecretSessionCipher.logTag) invalid recipientId")
}
@ -270,7 +270,7 @@ public class SMKDecryptResult: NSObject {
timestamp: UInt64,
localRecipientId: String,
localDeviceId: Int32,
protocolContext: Any?) throws -> SMKDecryptResult {
protocolContext: SPKProtocolWriteContext?) throws -> SMKDecryptResult {
guard timestamp > 0 else {
throw SMKError.assertionError(description: "\(logTag) invalid timestamp")
@ -509,7 +509,7 @@ public class SMKDecryptResult: NSObject {
// throws InvalidVersionException, InvalidMessageException, InvalidKeyException, DuplicateMessageException,
// InvalidKeyIdException, UntrustedIdentityException, LegacyMessageException, NoSessionException
private func throwswrapped_decrypt(messageContent: SMKUnidentifiedSenderMessageContent,
protocolContext: Any?) throws -> Data {
protocolContext: SPKProtocolWriteContext?) throws -> Data {
// SignalProtocolAddress sender = new SignalProtocolAddress(message.getSenderCertificate().getSender(),
// message.getSenderCertificate().getSenderDeviceId());

2
SignalMetadataKit/src/SMKUnidentifiedSenderMessage.swift
View File

@ -86,7 +86,7 @@ import Foundation
@objc public func serialized() throws -> Data {
let versionByte: UInt8 = UInt8((self.cipherTextVersion << 4 | self.cipherTextVersion) & 0xFF)
let versionBytes = [versionByte]
let versionData = Data(bytes: versionBytes)
let versionData = Data(versionBytes)
let messageData = try toProto().serializedData()
return NSData.join([versionData, messageData])