From a15eec83eb0478541ddda7550528fe7a352f8076 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Wed, 16 Dec 2020 11:45:01 +1100
Subject: [PATCH] Minor refactoring

---
 .../Sending & Receiving/MessageReceiver+Decryption.swift  | 3 ++-
 .../Sending & Receiving/MessageSender+Encryption.swift    | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/SessionMessagingKit/Sending & Receiving/MessageReceiver+Decryption.swift b/SessionMessagingKit/Sending & Receiving/MessageReceiver+Decryption.swift
index ea502640b..a20313452 100644
--- a/SessionMessagingKit/Sending & Receiving/MessageReceiver+Decryption.swift	
+++ b/SessionMessagingKit/Sending & Receiving/MessageReceiver+Decryption.swift	
@@ -45,7 +45,8 @@ internal extension MessageReceiver {
         let senderED25519PublicKey = Bytes(plaintextWithMetadata[plaintextWithMetadata.count - (signatureSize + ed25519PublicKeySize) ..< plaintextWithMetadata.count - signatureSize])
         let plaintext = Bytes(plaintextWithMetadata[0..<plaintextWithMetadata.count - (signatureSize + ed25519PublicKeySize)])
         // 3. ) Verify the signature
-        let isValid = sodium.sign.verify(message: plaintext + senderED25519PublicKey + recipientX25519PublicKey, publicKey: senderED25519PublicKey, signature: signature)
+        let verificationData = plaintext + senderED25519PublicKey + recipientX25519PublicKey
+        let isValid = sodium.sign.verify(message: verificationData, publicKey: senderED25519PublicKey, signature: signature)
         guard isValid else { throw Error.invalidSignature }
         // 4. ) Get the sender's X25519 public key
         guard let senderX25519PublicKey = sodium.sign.toX25519(ed25519PublicKey: senderED25519PublicKey) else { throw Error.decryptionFailed }
diff --git a/SessionMessagingKit/Sending & Receiving/MessageSender+Encryption.swift b/SessionMessagingKit/Sending & Receiving/MessageSender+Encryption.swift
index 7138fa2e6..ff11b4e39 100644
--- a/SessionMessagingKit/Sending & Receiving/MessageSender+Encryption.swift	
+++ b/SessionMessagingKit/Sending & Receiving/MessageSender+Encryption.swift	
@@ -18,10 +18,10 @@ internal extension MessageSender {
         let recipientX25519PublicKey = Data(hex: recipientHexEncodedX25519PublicKey.removing05PrefixIfNeeded())
         let sodium = Sodium()
         
-        let data = plaintext + Data(userED25519KeyPair.publicKey) + recipientX25519PublicKey
-        guard let signature = sodium.sign.signature(message: Bytes(data), secretKey: userED25519KeyPair.secretKey) else { throw Error.signingFailed }
-        guard let ciphertext = sodium.box.seal(message: Bytes(plaintext + Data(userED25519KeyPair.publicKey)
-            + Data(signature)), recipientPublicKey: Bytes(recipientX25519PublicKey)) else { throw Error.encryptionFailed }
+        let verificationData = plaintext + Data(userED25519KeyPair.publicKey) + recipientX25519PublicKey
+        guard let signature = sodium.sign.signature(message: Bytes(verificationData), secretKey: userED25519KeyPair.secretKey) else { throw Error.signingFailed }
+        let plaintextWithMetadata = plaintext + Data(userED25519KeyPair.publicKey) + Data(signature)
+        guard let ciphertext = sodium.box.seal(message: Bytes(plaintextWithMetadata), recipientPublicKey: Bytes(recipientX25519PublicKey)) else { throw Error.encryptionFailed }
         
         return Data(ciphertext)
     }