Revert "Enable sending dependency descriptor in group calls"

signalapp · Jun 27, 2024 · 6168edc · 6168edc
1 parent 6e1f641
commit 6168edc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/bin/fetch-artifact.py b/bin/fetch-artifact.py
@@ -18,14 +18,14 @@
 UNVERIFIED_DOWNLOAD_NAME = "unverified.tmp"
 
 PREBUILD_CHECKSUMS = {
-    'android': '67cc504d7042eaf267ca152c8120b651404000bedf440b1098f26cecc5b9c135',
-    'ios': '790f108db5a3824fc0dd6afb52407192e9e106febd00b1d65737395714b63530',
-    'linux-arm64': '093dd8419f0ef303c168ca0b0445fcd7ae7fb00ced2484f5162aeb0c04077caf',
-    'linux-x64': 'b6606b3b4627fcf6b8ab63485822eb6546d17549f8323519e8fa464b6c613dcf',
-    'mac-arm64': '664bb614be03887d2de249f4def97786c4b1a18de4d0e8b2cc6cf6c1e89c1bcd',
-    'mac-x64': 'ff06970bcbdaa4323a4667cd6f503e5510c253daa93d259257ca34b95fb22708',
-    'windows-arm64': '5333a84fc6324a259f06674152612fabb797510a92d573372a933284a89c7f26',
-    'windows-x64': 'db1cd60079de7a85e536208c35e2f1b1ff7e0df97e4011a387679994aa3bbdd5',
+    'android': '4090b4c6c362f54715ede47fdc9182785bb68c87f1380d3d4467cda5acb32efe',
+    'ios': 'd2267a6774a82b51b05cafa8cca310781e6f1a00d2844dd55f9b1c755ec66e34',
+    'linux-arm64': '3147936cf75f8d13df12a5648e4009acaa9a3c08ee5517fdd4d48ce9d3258686',
+    'linux-x64': '7011f117e7813d8b768d75a1c1c656c1d827d462bf97d686bf550f91f368fae5',
+    'mac-arm64': 'ce6cc24d2cb40ff59c1e1fa0ee27dc830974596d0908bb250843b91faabcf6ce',
+    'mac-x64': '5dd3daab006466a6a23ee16609c3a0003e6f40c0248f32ac49e3237801f59c00',
+    'windows-arm64': '55c1854c8af4663be3f293b18eb5f176e7dba7f76220ca807d73222d952747e9',
+    'windows-x64': 'ac3a2570d8639a461202aa3afe6318a0551469bfb15f8dd17a9d375d1bf6e860',
 }
 
 

diff --git a/config/version.properties b/config/version.properties
@@ -1,4 +1,4 @@
-webrtc.version=6478a
+webrtc.version=6478b
 
 ringrtc.version.major=2
 ringrtc.version.minor=44

diff --git a/src/rust/src/core/group_call.rs b/src/rust/src/core/group_call.rs
@@ -3358,7 +3358,7 @@ impl Client {
             .lock()
             .expect("Get e2ee context to encrypt media");
 
-        let unencrypted_header_len = Self::unencrypted_media_header_len(is_audio, !is_audio);
+        let unencrypted_header_len = Self::unencrypted_media_header_len(is_audio, false);
         Self::encrypt(
             &mut frame_crypto_context,
             unencrypted_header_len,
@@ -5393,12 +5393,15 @@ mod tests {
         let plaintext = &b"Fake Video Needs To Be Bigger"[..];
         let ciphertext1 = client1.encrypt_media(is_audio, plaintext).unwrap();
 
+        // Check that the first 10 bytes of video is left unencrypted
+        // and the rest has changed
+        assert_eq!(plaintext[..10], ciphertext1[..10]);
         assert_ne!(plaintext, &ciphertext1[..plaintext.len()]);
 
         assert_eq!(
             plaintext,
             client2
-                .decrypt_media(client1.demux_id, is_audio, &ciphertext1, true)
+                .decrypt_media(client1.demux_id, is_audio, &ciphertext1, false)
                 .unwrap()
         );
 
@@ -5601,7 +5604,7 @@ mod tests {
         assert_eq!(
             plaintext,
             client2
-                .decrypt_media(client1.demux_id, is_audio, &ciphertext, true)
+                .decrypt_media(client1.demux_id, is_audio, &ciphertext, false)
                 .unwrap()
         );
     }