Also guard before resetting to initial material

livekit · Oct 20, 2023 · e338269 · e338269
1 parent be1c6a7
commit e338269
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/e2ee/worker/FrameCryptor.ts b/src/e2ee/worker/FrameCryptor.ts
@@ -447,7 +447,7 @@ export class FrameCryptor extends BaseFrameCryptor {
            * yet and ratcheting, of course, did not solve the problem. So if we fail RATCHET_WINDOW_SIZE times,
            * we come back to the initial key.
            */
-          if (initialMaterial) {
+          if (initialMaterial && keySet === this.keys.getKeySet(keyIndex)) {
             workerLogger.debug('resetting to initial material');
             this.keys.setKeyFromMaterial(initialMaterial.material, keyIndex);
           }