iv generation moved into aes function

Author: sedanurakcil

src/hooks/useSendMessage.ts

@@ -1,6 +1,5 @@
 import { useContext } from "react";
 import { IMessage } from "react-native-gifted-chat";
-import forge from "node-forge";
 import { sendMessage } from "../utils/socket";
 import { CommtContext } from "../context/Context";
 import { addMessage } from "../context/actions/messagesAction";
@@ -61,10 +60,8 @@ const useSendMessage = () => {
     }
 
     // AES encryption is the standard encryption method and encrypts every messages. It encrypts data by generating IV.
-    const iv = forge.random.getBytesSync(16);
-    encryptedMessage = aesEncrypt({
+    const { encryptedMessage: encryptedMsg, iv } = aesEncrypt({
       key: secretKey,
-      iv,
       messageData: JSON.stringify({
         message: { ...messageContent, text: encryptedMessage },
         roomId,
@@ -74,8 +71,8 @@ const useSendMessage = () => {
 
     sendMessage(
       {
-        message: encryptedMessage,
-        iv: forge.util.bytesToHex(iv),
+        message: encryptedMsg,
+        iv,
       },
       (status) => {
         // If the message sending succesfully

src/utils/encryption.ts

@@ -2,7 +2,6 @@ import forge, { pki } from "node-forge";
 
 interface KeyProps {
   key: string;
-  iv: string;
 }
 
 interface AesEncryptProps extends KeyProps {
@@ -11,6 +10,7 @@ interface AesEncryptProps extends KeyProps {
 
 interface AesDecryptProps extends KeyProps {
   encryptedMessageData: string;
+  iv: string;
 }
 
 interface RsaEncryptProps {
@@ -23,18 +23,19 @@ interface RsaDecryptProps {
   privateKey: string;
 }
 
-export const aesEncrypt = ({
-  messageData,
-  key,
-  iv,
-}: AesEncryptProps): string => {
+export const aesEncrypt = ({ messageData, key }: AesEncryptProps) => {
+  let iv = forge.random.getBytesSync(16);
   const cipher = forge.cipher.createCipher("AES-CBC", key);
 
   cipher.start({ iv });
   cipher.update(forge.util.createBuffer(messageData, "utf8"));
   cipher.finish();
-  // return encrypted data
-  return cipher.output.toHex();
+
+  const encryptedMessage = cipher.output.toHex();
+  iv = forge.util.bytesToHex(iv);
+
+  // return encrypted message and iv
+  return { encryptedMessage, iv };
 };
 
 export const aesDecrypt = ({