@vex-chat/libvex 7.1.4 → 7.1.6

package/src/storage/sqlite.ts

@@ -538,24 +538,30 @@ export class SqliteStorage extends EventEmitter implements Storage {
             return;
         }
 
-        // Encrypt plaintext with at-rest key before saving to disk.
         const storedPlaintext = encodeStoredMessagePlaintext(message);
+        const isPlaintextFailurePlaceholder =
+            !message.decrypted &&
+            message.message === "" &&
+            message.extra === undefined;
         const fips = getCryptoProfile() === "fips";
-        const ct = fips
-            ? await xSecretboxAsync(
-                  XUtils.decodeUTF8(storedPlaintext),
-                  XUtils.decodeHex(message.nonce),
-                  this.atRestAesKey,
-              )
-            : xSecretbox(
-                  XUtils.decodeUTF8(storedPlaintext),
-                  XUtils.decodeHex(message.nonce),
-                  this.atRestAesKey,
+        const encryptedMessage = isPlaintextFailurePlaceholder
+            ? storedPlaintext
+            : XUtils.encodeHex(
+                  fips
+                      ? await xSecretboxAsync(
+                            XUtils.decodeUTF8(storedPlaintext),
+                            XUtils.decodeHex(message.nonce),
+                            this.atRestAesKey,
+                        )
+                      : xSecretbox(
+                            XUtils.decodeUTF8(storedPlaintext),
+                            XUtils.decodeHex(message.nonce),
+                            this.atRestAesKey,
+                        ),
               );
         if (this.isClosingNow()) {
             return;
         }
-        const encryptedMessage = XUtils.encodeHex(ct);
 
         try {
             await this.db
@@ -787,7 +793,9 @@ export class SqliteStorage extends EventEmitter implements Storage {
         for (const msg of messages) {
             const decryptedFlag = msg.decrypted !== 0;
             let plaintext = msg.message;
-            if (decryptedFlag) {
+            const isPlaintextFailurePlaceholder =
+                !decryptedFlag && msg.message === "" && msg.extra === null;
+            if (!isPlaintextFailurePlaceholder) {
                 const cipher = XUtils.decodeHex(msg.message);
                 const nonce = XUtils.decodeHex(msg.nonce);
                 const decrypted = fips

package/src/utils/ratchet.ts

@@ -16,8 +16,15 @@ import {
 } from "@vex-chat/crypto";
 
 const VERSION = 1;
+
+// Per-message derivation guard: do not derive more than this many skipped
+// message keys from a single ratchet header jump.
 export const MAX_SKIP_MESSAGE_GAP = 1024;
-export const MAX_SKIPPED_KEYS = 4096;
+
+// Per-session retention guard: keep this close to Signal's recommended
+// skipped-message-key cache bound so delayed messages work without retaining
+// excessive decryptable past message keys.
+export const MAX_SKIPPED_KEYS = 1024;
 
 const encoder = new TextEncoder();