Fix aes-ctr padding

Author: evgeny-nadymov

src/Calls/P2P/P2PEncryptor.js

@@ -63,6 +63,12 @@ export default class P2PEncryptor {
             const enc = new TextEncoder();
             const arr = enc.encode(str);
 
+            // const base64 = btoa(str);
+            // const inputWA = CryptoJS.enc.Base64.parse(base64);
+            // const input8Arr = wordArrayToUint8Array(inputWA);
+
+            // const packet = this.encryptRawPacket(input8Arr);
+            // console.log('[arr] ', arr, input8Arr);
             const packet = this.encryptRawPacket(new Uint8Array(arr));
 
             const { bytes } = packet;
@@ -194,7 +200,7 @@ export default class P2PEncryptor {
             const encrypted = CryptoJS.AES.encrypt(str, key, {
                 mode: CryptoJS.mode.CTR,
                 iv,
-                padding: CryptoJS.pad.ZeroPadding
+                padding: CryptoJS.pad.NoPadding
             });
 
             const result = wordArrayToUint8Array(encrypted.ciphertext);
@@ -206,7 +212,7 @@ export default class P2PEncryptor {
             const decrypted = CryptoJS.AES.decrypt({ ciphertext: str }, key, {
                 mode: CryptoJS.mode.CTR,
                 iv,
-                padding: CryptoJS.pad.ZeroPadding
+                padding: CryptoJS.pad.NoPadding
             });
 
             const result = wordArrayToUint8Array(decrypted);
@@ -265,6 +271,7 @@ export default class P2PEncryptor {
             return null;
         }
 
+        console.log('[base64] decryptionBuffer', decryptionBuffer);
         const resultBuffer = decryptionBuffer.slice(4);
 
         return resultBuffer;

src/Stores/CallStore.js

@@ -246,11 +246,15 @@ class CallStore extends EventEmitter {
                 try {
                     const { currentCall } = this;
                     if (currentCall) {
-                        const { encryptor } = currentCall;
+                        const { encryptor, decryptor } = currentCall;
                         if (encryptor) {
                             const decryptedData = encryptor.decryptFromBase64(data);
-                            LOG_P2P_CALL('[update] updateNewCallSignalingData', update, decryptedData);
+
+                            const base64 = decryptor.encryptToBase64(data);
+                            LOG_P2P_CALL('[update][base64] updateNewCallSignalingData', update, { key: encryptor.keyBase64, data, base64, decryptedData });
+
                             const signalingData = JSON.parse(decryptedData);
+
                             // LOG_P2P_CALL('[update] updateNewCallSignalingData', update, signalingData);
                             // const signalingData = JSON.parse(atob(data));
                             if (this.p2pCallsEnabled) {
@@ -1804,7 +1808,8 @@ class CallStore extends EventEmitter {
             connection,
             inputStream: null,
             outputStream,
-            encryptor: new P2PEncryptor(is_outgoing, encryption_key)
+            encryptor: new P2PEncryptor(is_outgoing, encryption_key),
+            decryptor: new P2PEncryptor(!is_outgoing, encryption_key)
         };
         LOG_P2P_CALL('p2pJoinCall currentCall', this.currentCall);