From c0b114797a31a5e87d03b92d4563f90effbc397c Mon Sep 17 00:00:00 2001 From: Jordan Rose Date: Wed, 27 Jan 2021 14:58:17 -0800 Subject: [PATCH] Fix misuse of logTag, prefer Int32.max to INT32_MAX --- SignalMetadataKit/src/SMKSecretSessionCipher.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SignalMetadataKit/src/SMKSecretSessionCipher.swift b/SignalMetadataKit/src/SMKSecretSessionCipher.swift index 419c5b2..59366d2 100644 --- a/SignalMetadataKit/src/SMKSecretSessionCipher.swift +++ b/SignalMetadataKit/src/SMKSecretSessionCipher.swift @@ -202,7 +202,7 @@ fileprivate extension SMKMessageType { senderCertificate: SenderCertificate, protocolContext: SPKProtocolWriteContext?) throws -> Data { guard deviceId > 0 else { - throw SMKError.assertionError(description: "\(String(describing: SMKSecretSessionCipher.logTag)) invalid deviceId") + throw SMKError.assertionError(description: "\(logTag) invalid deviceId") } // CiphertextMessage message = new SessionCipher(signalProtocolStore, destinationAddress).encrypt(paddedPlaintext); @@ -260,7 +260,7 @@ fileprivate extension SMKMessageType { // decrypt(content)); // // NOTE: We use the sender properties from the sender certificate, not from this class' properties. - guard senderAddress.deviceId <= INT_MAX else { + guard senderAddress.deviceId <= Int32.max else { throw SMKError.assertionError(description: "\(logTag) Invalid senderDeviceId.") } return SMKDecryptResult(senderAddress: SMKAddress(senderAddress), @@ -287,7 +287,7 @@ fileprivate extension SMKMessageType { // // NOTE: We use the sender properties from the sender certificate, not from this class' properties. let sender = messageContent.senderCertificate.sender - guard sender.deviceId >= 0 && sender.deviceId <= INT32_MAX else { + guard sender.deviceId >= 0 && sender.deviceId <= Int32.max else { throw SMKError.assertionError(description: "\(logTag) Invalid senderDeviceId.") }