@cloudpss/crypto 0.5.24 → 0.5.26

package/benchmark.js

@@ -0,0 +1,44 @@
+/* eslint-disable no-console */
+import prettyBytes from 'pretty-bytes';
+import files from '../../benchmark-files/index.js';
+import { createModule } from './dist/encryption/module.js';
+import * as wasm from './dist/encryption/wasm.js';
+import * as web from './dist/encryption/web.js';
+import * as node from './dist/encryption/node.js';
+
+const t = (/** @type {number} */ time) =>
+    Number.isFinite(time) ? (time.toFixed(2) + 'ms').padStart(10) : '  --------';
+
+const pb = (/** @type {number} */ size) => prettyBytes(size, { binary: true });
+
+/** 生成测试 */
+function createTest(/** @type {string} */ name, { encrypt, decrypt }, /** @type {boolean} */ decompressOnly = false) {
+    /** 测试函数 */
+    async function fn(/** @type {Buffer} */ data) {
+        let start = performance.now();
+        const encrypted = await encrypt(data, 'pass').catch((e) => console.error(e.message));
+        const encryptTime = performance.now() - start;
+        start = performance.now();
+        const decrypted = await decrypt(encrypted, 'pass').catch((e) => console.error(e.message));
+        const decryptTime = performance.now() - start;
+        console.assert(data.equals(decrypted), name, `unmatched`);
+        return { encrypted, encryptTime, decryptTime };
+    }
+    Object.defineProperty(fn, 'name', { value: name });
+    return fn;
+}
+const tests = [
+    createTest('web', createModule(web)),
+    createTest('node', createModule(node)),
+    createTest('wasm', createModule(wasm)),
+];
+for await (const { file, data } of files()) {
+    console.log(`File: ${file} \tRaw: ${pb(data.length)}`);
+    for (const test of tests) {
+        const result = await test(data);
+        const diff = `+${result.encrypted.length - data.length}`;
+        console.log(
+            `  ${test.name.padEnd(25)} ${diff.padStart(6)}    ${t(result.encryptTime)}    ${t(result.decryptTime)}`,
+        );
+    }
+}

package/dist/encryption/browser.d.ts

@@ -1,5 +1,5 @@
-import type { EncryptionResult } from './common.js';
+import type { EncryptedData, PlainData } from './common.js';
 /** browser encrypt */
-export declare function encrypt(data: Uint8Array, passphrase: string): Promise<EncryptionResult>;
+export declare function encrypt(data: PlainData, passphrase: string): Promise<EncryptedData>;
 /** browser decrypt */
-export declare function decrypt(data: EncryptionResult, passphrase: string): Promise<Uint8Array>;
+export declare function decrypt(data: EncryptedData, passphrase: string): Promise<PlainData>;

package/dist/encryption/browser.js

@@ -1,7 +1,6 @@
 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
 const module = () => {
     if (typeof crypto == 'object' &&
-        typeof crypto.getRandomValues == 'function' &&
         typeof crypto.subtle == 'object' &&
         typeof crypto.subtle.importKey == 'function' &&
         typeof crypto.subtle.deriveKey == 'function' &&
@@ -10,7 +9,7 @@ const module = () => {
         return import('./web.js');
     }
     else {
-        return import('./pure-js.js');
+        return import('./wasm.js');
     }
 };
 /** browser encrypt */

package/dist/encryption/browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../src/encryption/browser.ts"],"names":[],"mappings":"AAEA,4EAA4E;AAC5E,MAAM,MAAM,GAAG,GAAG,EAAE;IAChB,IACI,OAAO,MAAM,IAAI,QAAQ;QACzB,OAAO,MAAM,CAAC,eAAe,IAAI,UAAU;QAC3C,OAAO,MAAM,CAAC,MAAM,IAAI,QAAQ;QAChC,OAAO,MAAM,CAAC,MAAM,CAAC,SAAS,IAAI,UAAU;QAC5C,OAAO,MAAM,CAAC,MAAM,CAAC,SAAS,IAAI,UAAU;QAC5C,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,IAAI,UAAU;QAC1C,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,IAAI,UAAU,EAC5C,CAAC;QACC,OAAO,MAAM,CAAC,UAAU,CAAC,CAAC;IAC9B,CAAC;SAAM,CAAC;QACJ,OAAO,MAAM,CAAC,cAAc,CAAC,CAAC;IAClC,CAAC;AACL,CAAC,CAAC;AAEF,sBAAsB;AACtB,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAAgB,EAAE,UAAkB;IAC9D,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,EAAE,CAAC;IACnC,OAAO,MAAM,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AAC3C,CAAC;AAED,sBAAsB;AACtB,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAAsB,EAAE,UAAkB;IACpE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,EAAE,CAAC;IACnC,OAAO,MAAM,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AAC3C,CAAC"}
+{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../src/encryption/browser.ts"],"names":[],"mappings":"AAEA,4EAA4E;AAC5E,MAAM,MAAM,GAAG,GAAG,EAAE;IAChB,IACI,OAAO,MAAM,IAAI,QAAQ;QACzB,OAAO,MAAM,CAAC,MAAM,IAAI,QAAQ;QAChC,OAAO,MAAM,CAAC,MAAM,CAAC,SAAS,IAAI,UAAU;QAC5C,OAAO,MAAM,CAAC,MAAM,CAAC,SAAS,IAAI,UAAU;QAC5C,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,IAAI,UAAU;QAC1C,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,IAAI,UAAU,EAC5C,CAAC;QACC,OAAO,MAAM,CAAC,UAAU,CAAC,CAAC;IAC9B,CAAC;SAAM,CAAC;QACJ,OAAO,MAAM,CAAC,WAAW,CAAC,CAAC;IAC/B,CAAC;AACL,CAAC,CAAC;AAEF,sBAAsB;AACtB,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAAe,EAAE,UAAkB;IAC7D,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,EAAE,CAAC;IACnC,OAAO,MAAM,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AAC3C,CAAC;AAED,sBAAsB;AACtB,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAAmB,EAAE,UAAkB;IACjE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,EAAE,CAAC;IACnC,OAAO,MAAM,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AAC3C,CAAC"}

package/dist/encryption/common.d.ts

@@ -1,21 +1,50 @@
-/**
- * PBKDF2 迭代次数
- */
+/** PBKDF2 迭代次数 */
 export declare const PBKDF2_ITERATIONS = 100000;
-/**
- * PBKDF2 盐值长度（byte）
- */
-export declare const PBKDF2_SALT_SIZE: number;
-/** IV 长度（byte） */
-export declare const AES_IV_SIZE: number;
+/** NONCE 长度（byte） */
+export declare const NONCE_SIZE: number;
+/** AAD 最大长度（byte） */
+export declare const AAD_MAX_SIZE: number;
+/** AAD 长度字段长度（byte） */
+export declare const AAD_LEN_SIZE = 4;
+/** AAD padding */
+export declare const AAD_PADDING: number;
 /** KEY 长度（byte） */
 export declare const AES_KEY_SIZE: number;
-/** 加密结果 */
-export interface EncryptionResult {
-    /** 盐值 */
-    salt: Uint8Array;
-    /** 初始向量 */
-    iv: Uint8Array;
-    /** 加密后的数据 */
+/** Auth tag 长度（byte） */
+export declare const AES_TAG_SIZE: number;
+/** 加密输入/解密结果 */
+export interface PlainData {
+    /** 附加数据 */
+    aad?: Uint8Array;
+    /** 明文数据 */
     data: Uint8Array;
 }
+/** 解密输入/加密结果 */
+export interface EncryptedData {
+    /** NONCE */
+    nonce: Uint8Array;
+    /** 附加数据 */
+    aad?: Uint8Array;
+    /** 加密后的数据和 tag */
+    data: Uint8Array;
+}
+/**
+ * CloudPSS 数据加密
+ * - 密钥生成算法：PBKDF2-HMAC-SHA256，盐长度 96，迭代 100,000 次
+ * - 加密算法：AES-256-GCM，使用与密钥生成算法的盐作为 NONCE，TAG 长度 128
+ * - 附加数据：最大长度 0x7fff_ffff
+ *
+ * - 文件格式：
+ *   - Magic Number: 0e 02 49 29 3f 07 7b 0a
+ *   - Nonce: 96 bits
+ *   - Length of AAD: 4 bytes
+ *   - AAD (if exists)
+ *   - Encrypted Data
+ *   - Auth Tag: 128 bits
+ */
+/** CloudPSS 数据加密 */
+export declare const MAGIC_NUMBER: Uint8Array;
+/** 计算对齐后的长度 */
+export declare function padding(size: number, padding: number): number;
+/** 解析 CloudPSS 加密数据 */
+export declare function parseEncrypted(data: BinaryData): EncryptedData | undefined;

package/dist/encryption/common.js

@@ -1,13 +1,63 @@
-/**
- * PBKDF2 迭代次数
- */
+import { toUint8Array } from '../utils.js';
+/** PBKDF2 迭代次数 */
 export const PBKDF2_ITERATIONS = 100_000;
-/**
- * PBKDF2 盐值长度（byte）
- */
-export const PBKDF2_SALT_SIZE = 128 / 8;
-/** IV 长度（byte） */
-export const AES_IV_SIZE = 128 / 8;
+/** NONCE 长度（byte） */
+export const NONCE_SIZE = 96 / 8;
+/** AAD 最大长度（byte） */
+export const AAD_MAX_SIZE = 1024 * 1024 * 1024; // 1GiB
+/** AAD 长度字段长度（byte） */
+export const AAD_LEN_SIZE = 4;
+// 与 AES 一致对齐
+/** AAD padding */
+export const AAD_PADDING = 128 / 8;
 /** KEY 长度（byte） */
 export const AES_KEY_SIZE = 256 / 8;
+/** Auth tag 长度（byte） */
+export const AES_TAG_SIZE = 128 / 8;
+/**
+ * CloudPSS 数据加密
+ * - 密钥生成算法：PBKDF2-HMAC-SHA256，盐长度 96，迭代 100,000 次
+ * - 加密算法：AES-256-GCM，使用与密钥生成算法的盐作为 NONCE，TAG 长度 128
+ * - 附加数据：最大长度 0x7fff_ffff
+ *
+ * - 文件格式：
+ *   - Magic Number: 0e 02 49 29 3f 07 7b 0a
+ *   - Nonce: 96 bits
+ *   - Length of AAD: 4 bytes
+ *   - AAD (if exists)
+ *   - Encrypted Data
+ *   - Auth Tag: 128 bits
+ */
+/** CloudPSS 数据加密 */
+export const MAGIC_NUMBER = Uint8Array.from([0x0e, 0x02, 0x49, 0x29, 0x3f, 0x07, 0x7b, 0x0a]);
+const MIN_ENCRYPTED_SIZE = MAGIC_NUMBER.length + NONCE_SIZE + AAD_LEN_SIZE + AES_TAG_SIZE;
+/** 计算对齐后的长度 */
+export function padding(size, padding) {
+    return (size + padding - 1) & ~(padding - 1);
+}
+/** 解析 CloudPSS 加密数据 */
+export function parseEncrypted(data) {
+    const buffer = toUint8Array(data);
+    if (buffer.byteLength < MIN_ENCRYPTED_SIZE)
+        return undefined;
+    if (!MAGIC_NUMBER.every((v, i) => buffer[i] === v))
+        return undefined;
+    const nonce = buffer.subarray(MAGIC_NUMBER.length, MAGIC_NUMBER.length + NONCE_SIZE);
+    const aadSize = (buffer[MAGIC_NUMBER.length + NONCE_SIZE] << 24) |
+        (buffer[MAGIC_NUMBER.length + NONCE_SIZE + 1] << 16) |
+        (buffer[MAGIC_NUMBER.length + NONCE_SIZE + 2] << 8) |
+        buffer[MAGIC_NUMBER.length + NONCE_SIZE + 3];
+    if (aadSize > AAD_MAX_SIZE || aadSize < 0) {
+        return undefined;
+    }
+    const paddingAadSize = padding(aadSize, AAD_PADDING);
+    if (buffer.byteLength < paddingAadSize + MIN_ENCRYPTED_SIZE) {
+        return undefined;
+    }
+    const aad = aadSize
+        ? buffer.subarray(MAGIC_NUMBER.length + NONCE_SIZE + AAD_LEN_SIZE, MAGIC_NUMBER.length + NONCE_SIZE + AAD_LEN_SIZE + aadSize)
+        : undefined;
+    const encrypted = buffer.subarray(MAGIC_NUMBER.length + NONCE_SIZE + AAD_LEN_SIZE + paddingAadSize);
+    return { nonce, aad, data: encrypted };
+}
 //# sourceMappingURL=common.js.map

package/dist/encryption/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/encryption/common.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,OAAO,CAAC;AACzC;;GAEG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,GAAG,CAAC,CAAC;AACxC,kBAAkB;AAClB,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,GAAG,CAAC,CAAC;AACnC,mBAAmB;AACnB,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,GAAG,CAAC,CAAC"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/encryption/common.ts"],"names":[],"mappings":"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"}

package/dist/encryption/index.d.ts

@@ -1,26 +1,9 @@
-/**
- * CloudPSS 数据加密
- * - 密钥生成算法：PBKDF2-HMAC-SHA256，盐长度 128，迭代 100,000 次
- * - 加密算法：AES-256-CBC
- *
- * - 文件格式：
- *   - Magic Number: 0e 02 49 29 3f 07 7b 0a
- *   - Salt: 128 bits
- *   - IV: 128 bits
- *   - Encrypted Data
- */
-/** CloudPSS 数据加密 */
-export declare const MAGIC_NUMBER: Uint8Array;
+export { MAGIC_NUMBER } from './common.js';
 /** 检查是否为 CloudPSS 加密数据 */
 export declare function isEncrypted(data: BinaryData): boolean;
 /**
- * 加密数据
- * @throws {TypeError} 如果密码无效
- */
-export declare function encrypt(data: BinaryData, passphrase: string): Promise<Uint8Array>;
-/**
- * 解密数据
+ * 从加密数据中提取附加数据
  * @throws {TypeError} 如果数据不是有效的加密数据
- * @throws {TypeError} 如果密码无效
  */
-export declare function decrypt(data: BinaryData, passphrase: string): Promise<Uint8Array>;
+export declare function extractAad(data: BinaryData): Uint8Array | undefined;
+export declare const encrypt: (data: BinaryData, passphrase: string) => Promise<Uint8Array>, decrypt: (data: BinaryData, passphrase: string) => Promise<Uint8Array>, encryptAad: (data: BinaryData, aad: BinaryData | undefined, passphrase: string) => Promise<Uint8Array>;

package/dist/encryption/index.js

@@ -1,74 +1,22 @@
 import * as impl from '#encryption';
-import { toUint8Array } from '../utils.js';
-import { AES_IV_SIZE, PBKDF2_SALT_SIZE } from './common.js';
-/**
- * CloudPSS 数据加密
- * - 密钥生成算法：PBKDF2-HMAC-SHA256，盐长度 128，迭代 100,000 次
- * - 加密算法：AES-256-CBC
- *
- * - 文件格式：
- *   - Magic Number: 0e 02 49 29 3f 07 7b 0a
- *   - Salt: 128 bits
- *   - IV: 128 bits
- *   - Encrypted Data
- */
-/** CloudPSS 数据加密 */
-export const MAGIC_NUMBER = Uint8Array.from([0x0e, 0x02, 0x49, 0x29, 0x3f, 0x07, 0x7b, 0x0a]);
-/** 检查是否为 CloudPSS 加密数据 */
-function isEncryptedImpl(data) {
-    return (data.length > MAGIC_NUMBER.length + PBKDF2_SALT_SIZE + AES_IV_SIZE &&
-        MAGIC_NUMBER.every((v, i) => data[i] === v));
-}
+import { parseEncrypted } from './common.js';
+import { createModule } from './module.js';
+export { MAGIC_NUMBER } from './common.js';
 /** 检查是否为 CloudPSS 加密数据 */
 export function isEncrypted(data) {
-    const buffer = toUint8Array(data);
-    return isEncryptedImpl(buffer);
-}
-/** 检查密码 */
-function assertPassphrase(passphrase) {
-    if (typeof passphrase !== 'string') {
-        throw new TypeError('Invalid passphrase, must be a string');
-    }
-    if (passphrase.length === 0) {
-        throw new TypeError('Invalid passphrase, must not be empty');
-    }
-}
-/**
- * 加密数据
- * @throws {TypeError} 如果密码无效
- */
-export async function encrypt(data, passphrase) {
-    assertPassphrase(passphrase);
-    const buffer = toUint8Array(data);
-    const encrypted = await impl.encrypt(buffer, passphrase);
-    const result = new Uint8Array(MAGIC_NUMBER.length + PBKDF2_SALT_SIZE + AES_IV_SIZE + encrypted.data.length);
-    result.set(MAGIC_NUMBER);
-    result.set(encrypted.salt, MAGIC_NUMBER.length);
-    result.set(encrypted.iv, MAGIC_NUMBER.length + PBKDF2_SALT_SIZE);
-    result.set(encrypted.data, MAGIC_NUMBER.length + PBKDF2_SALT_SIZE + AES_IV_SIZE);
-    return result;
+    return parseEncrypted(data) != null;
 }
 /**
- * 解密数据
+ * 从加密数据中提取附加数据
  * @throws {TypeError} 如果数据不是有效的加密数据
- * @throws {TypeError} 如果密码无效
  */
-export async function decrypt(data, passphrase) {
-    assertPassphrase(passphrase);
-    const buffer = toUint8Array(data);
-    if (!isEncryptedImpl(buffer)) {
+export function extractAad(data) {
+    const encrypted = parseEncrypted(data);
+    if (encrypted == null) {
         throw new TypeError('Invalid encrypted data');
     }
-    const encrypted = {
-        salt: buffer.subarray(MAGIC_NUMBER.length, MAGIC_NUMBER.length + PBKDF2_SALT_SIZE),
-        iv: buffer.subarray(MAGIC_NUMBER.length + PBKDF2_SALT_SIZE, MAGIC_NUMBER.length + PBKDF2_SALT_SIZE + AES_IV_SIZE),
-        data: buffer.subarray(MAGIC_NUMBER.length + PBKDF2_SALT_SIZE + AES_IV_SIZE),
-    };
-    try {
-        return await impl.decrypt(encrypted, passphrase);
-    }
-    catch (ex) {
-        throw new Error('Wrong passphrase', { cause: ex });
-    }
+    return encrypted.aad;
 }
+// eslint-disable-next-line @typescript-eslint/unbound-method
+export const { encrypt, decrypt, encryptAad } = createModule(impl);
 //# sourceMappingURL=index.js.map

package/dist/encryption/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/encryption/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE5D;;;;;;;;;;GAUG;AAEH,oBAAoB;AACpB,MAAM,CAAC,MAAM,YAAY,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;AAE9F,0BAA0B;AAC1B,SAAS,eAAe,CAAC,IAAgB;IACrC,OAAO,CACH,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,MAAM,GAAG,gBAAgB,GAAG,WAAW;QAClE,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAC9C,CAAC;AACN,CAAC;AAED,0BAA0B;AAC1B,MAAM,UAAU,WAAW,CAAC,IAAgB;IACxC,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IAClC,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC;AACnC,CAAC;AAED,WAAW;AACX,SAAS,gBAAgB,CAAC,UAAkB;IACxC,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;QACjC,MAAM,IAAI,SAAS,CAAC,sCAAsC,CAAC,CAAC;IAChE,CAAC;IACD,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,SAAS,CAAC,uCAAuC,CAAC,CAAC;IACjE,CAAC;AACL,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAAgB,EAAE,UAAkB;IAC9D,gBAAgB,CAAC,UAAU,CAAC,CAAC;IAC7B,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IAClC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACzD,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,YAAY,CAAC,MAAM,GAAG,gBAAgB,GAAG,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5G,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IACzB,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IAChD,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,EAAE,YAAY,CAAC,MAAM,GAAG,gBAAgB,CAAC,CAAC;IACjE,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,YAAY,CAAC,MAAM,GAAG,gBAAgB,GAAG,WAAW,CAAC,CAAC;IACjF,OAAO,MAAM,CAAC;AAClB,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAAgB,EAAE,UAAkB;IAC9D,gBAAgB,CAAC,UAAU,CAAC,CAAC;IAC7B,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IAClC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,SAAS,CAAC,wBAAwB,CAAC,CAAC;IAClD,CAAC;IACD,MAAM,SAAS,GAAG;QACd,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,MAAM,EAAE,YAAY,CAAC,MAAM,GAAG,gBAAgB,CAAC;QAClF,EAAE,EAAE,MAAM,CAAC,QAAQ,CACf,YAAY,CAAC,MAAM,GAAG,gBAAgB,EACtC,YAAY,CAAC,MAAM,GAAG,gBAAgB,GAAG,WAAW,CACvD;QACD,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,MAAM,GAAG,gBAAgB,GAAG,WAAW,CAAC;KAC9E,CAAC;IACF,IAAI,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IACrD,CAAC;IAAC,OAAO,EAAE,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,kBAAkB,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;IACvD,CAAC;AACL,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/encryption/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,0BAA0B;AAC1B,MAAM,UAAU,WAAW,CAAC,IAAgB;IACxC,OAAO,cAAc,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;AACxC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,UAAU,CAAC,IAAgB;IACvC,MAAM,SAAS,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;IACvC,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;QACpB,MAAM,IAAI,SAAS,CAAC,wBAAwB,CAAC,CAAC;IAClD,CAAC;IACD,OAAO,SAAS,CAAC,GAAG,CAAC;AACzB,CAAC;AAED,6DAA6D;AAC7D,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC"}

package/dist/encryption/module.d.ts

@@ -0,0 +1,22 @@
+/** 模块 */
+interface Module {
+    /**
+     * 加密数据
+     * @throws {TypeError} 如果密码无效
+     */
+    encrypt(data: BinaryData, passphrase: string): Promise<Uint8Array>;
+    /**
+     * 加密数据，包含不加密的附加数据
+     * @throws {TypeError} 如果密码无效
+     */
+    encryptAad(data: BinaryData, aad: BinaryData | undefined, passphrase: string): Promise<Uint8Array>;
+    /**
+     * 解密数据
+     * @throws {TypeError} 如果数据不是有效的加密数据
+     * @throws {TypeError} 如果密码无效
+     */
+    decrypt(data: BinaryData, passphrase: string): Promise<Uint8Array>;
+}
+/** 创建模块 */
+export declare function createModule(impl: typeof import('#encryption') | typeof import('./wasm.js')): Module;
+export {};

package/dist/encryption/module.js

@@ -0,0 +1,62 @@
+import { toUint8Array } from '../utils.js';
+import { AAD_LEN_SIZE, AAD_MAX_SIZE, AAD_PADDING, MAGIC_NUMBER, NONCE_SIZE, padding, parseEncrypted, } from './common.js';
+/** 检查密码 */
+function assertPassphrase(passphrase) {
+    if (typeof passphrase !== 'string') {
+        throw new TypeError('Invalid passphrase, must be a string');
+    }
+    if (passphrase.length === 0) {
+        throw new TypeError('Invalid passphrase, must not be empty');
+    }
+}
+/** 创建模块 */
+export function createModule(impl) {
+    const encryptAad = async (data, aad, passphrase) => {
+        assertPassphrase(passphrase);
+        const aadSize = aad?.byteLength ?? 0;
+        if (aadSize > AAD_MAX_SIZE) {
+            throw new TypeError('Invalid AAD size');
+        }
+        const paddedAddSize = padding(aadSize, AAD_PADDING);
+        const plain = {
+            aad: aadSize ? toUint8Array(aad) : undefined,
+            data: toUint8Array(data),
+        };
+        const encrypted = await impl.encrypt(plain, passphrase);
+        const result = new Uint8Array(MAGIC_NUMBER.length + NONCE_SIZE + AAD_LEN_SIZE + paddedAddSize + encrypted.data.length);
+        result.set(MAGIC_NUMBER);
+        result.set(encrypted.nonce, MAGIC_NUMBER.length);
+        if (aadSize) {
+            result[MAGIC_NUMBER.length + NONCE_SIZE] = aadSize >>> 24;
+            result[MAGIC_NUMBER.length + NONCE_SIZE + 1] = aadSize >>> 16;
+            result[MAGIC_NUMBER.length + NONCE_SIZE + 2] = aadSize >>> 8;
+            result[MAGIC_NUMBER.length + NONCE_SIZE + 3] = aadSize;
+            result.set(plain.aad, MAGIC_NUMBER.length + NONCE_SIZE + AAD_LEN_SIZE);
+        }
+        result.set(encrypted.data, MAGIC_NUMBER.length + NONCE_SIZE + AAD_LEN_SIZE + paddedAddSize);
+        return result;
+    };
+    const encrypt = async (data, passphrase) => {
+        return await encryptAad(data, undefined, passphrase);
+    };
+    const decrypt = async (data, passphrase) => {
+        assertPassphrase(passphrase);
+        const encrypted = parseEncrypted(data);
+        if (encrypted == null) {
+            throw new TypeError('Invalid encrypted data');
+        }
+        try {
+            const result = await impl.decrypt(encrypted, passphrase);
+            return result.data;
+        }
+        catch (ex) {
+            throw new Error('Wrong passphrase', { cause: ex });
+        }
+    };
+    return {
+        encrypt,
+        encryptAad,
+        decrypt,
+    };
+}
+//# sourceMappingURL=module.js.map

package/dist/encryption/module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/encryption/module.ts"],"names":[],"mappings":"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"}

package/dist/encryption/node.d.ts

@@ -1,5 +1,5 @@
-import { type EncryptionResult } from './common.js';
+import { type EncryptedData, type PlainData } from './common.js';
 /** nodejs encrypt */
-export declare function encrypt(data: Uint8Array, passphrase: string): Promise<EncryptionResult>;
+export declare function encrypt({ data, aad }: PlainData, passphrase: string): Promise<EncryptedData>;
 /** nodejs decrypt */
-export declare function decrypt({ data, iv, salt }: EncryptionResult, passphrase: string): Promise<Uint8Array>;
+export declare function decrypt({ nonce, aad, data }: EncryptedData, passphrase: string): Promise<PlainData>;

package/dist/encryption/node.js

@@ -1,28 +1,32 @@
 import { pbkdf2 as _pbkdf2, createCipheriv, createDecipheriv, randomBytes } from 'node:crypto';
-import { PBKDF2_ITERATIONS, PBKDF2_SALT_SIZE, AES_IV_SIZE, AES_KEY_SIZE } from './common.js';
+import { PBKDF2_ITERATIONS, NONCE_SIZE, AES_TAG_SIZE, AES_KEY_SIZE, } from './common.js';
 import { promisify } from 'node:util';
 import { toUint8Array } from '../utils.js';
+const pbkdf2 = promisify(_pbkdf2);
 const aesKdf = (passphrase, salt) => {
-    return promisify(_pbkdf2)(passphrase, salt, PBKDF2_ITERATIONS, AES_KEY_SIZE, 'sha256');
+    return pbkdf2(passphrase, salt, PBKDF2_ITERATIONS, AES_KEY_SIZE, 'sha256');
 };
 /** nodejs encrypt */
-export async function encrypt(data, passphrase) {
-    const salt = randomBytes(PBKDF2_SALT_SIZE);
-    const key = await aesKdf(passphrase, salt);
-    const iv = randomBytes(AES_IV_SIZE);
-    const cipher = createCipheriv('aes-256-cbc', key, iv);
-    const encrypted = Buffer.concat([cipher.update(data), cipher.final()]);
+export async function encrypt({ data, aad }, passphrase) {
+    const nonce = randomBytes(NONCE_SIZE);
+    const key = await aesKdf(passphrase, nonce);
+    const cipher = createCipheriv('aes-256-gcm', key, nonce, { authTagLength: AES_TAG_SIZE });
+    if (aad)
+        cipher.setAAD(aad);
+    const encrypted = Buffer.concat([cipher.update(data), cipher.final(), cipher.getAuthTag()]);
     return {
-        salt: toUint8Array(salt),
-        iv: toUint8Array(iv),
+        nonce: toUint8Array(nonce),
         data: toUint8Array(encrypted),
     };
 }
 /** nodejs decrypt */
-export async function decrypt({ data, iv, salt }, passphrase) {
-    const key = await aesKdf(passphrase, salt);
-    const decipher = createDecipheriv('aes-256-cbc', key, iv);
-    const decrypted = Buffer.concat([decipher.update(data), decipher.final()]);
-    return toUint8Array(decrypted);
+export async function decrypt({ nonce, aad, data }, passphrase) {
+    const key = await aesKdf(passphrase, nonce);
+    const decipher = createDecipheriv('aes-256-gcm', key, nonce, { authTagLength: AES_TAG_SIZE });
+    decipher.setAuthTag(data.subarray(data.length - AES_TAG_SIZE));
+    if (aad)
+        decipher.setAAD(aad);
+    const decrypted = Buffer.concat([decipher.update(data.subarray(0, data.length - AES_TAG_SIZE)), decipher.final()]);
+    return { data: toUint8Array(decrypted) };
 }
 //# sourceMappingURL=node.js.map

package/dist/encryption/node.js.map

@@ -1 +1 @@
-{"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/encryption/node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/F,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAyB,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACpH,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,MAAM,GAAG,CAAC,UAAkB,EAAE,IAAgB,EAAmB,EAAE;IACrE,OAAO,SAAS,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,iBAAiB,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;AAC3F,CAAC,CAAC;AAEF,qBAAqB;AACrB,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAAgB,EAAE,UAAkB;IAC9D,MAAM,IAAI,GAAG,WAAW,CAAC,gBAAgB,CAAC,CAAC;IAC3C,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC3C,MAAM,EAAE,GAAG,WAAW,CAAC,WAAW,CAAC,CAAC;IACpC,MAAM,MAAM,GAAG,cAAc,CAAC,aAAa,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IACtD,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACvE,OAAO;QACH,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC;QACxB,EAAE,EAAE,YAAY,CAAC,EAAE,CAAC;QACpB,IAAI,EAAE,YAAY,CAAC,SAAS,CAAC;KAChC,CAAC;AACN,CAAC;AAED,qBAAqB;AACrB,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAoB,EAAE,UAAkB;IAClF,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC3C,MAAM,QAAQ,GAAG,gBAAgB,CAAC,aAAa,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IAC1D,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAC3E,OAAO,YAAY,CAAC,SAAS,CAAC,CAAC;AACnC,CAAC"}
+{"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/encryption/node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/F,OAAO,EACH,iBAAiB,EACjB,UAAU,EACV,YAAY,EACZ,YAAY,GAGf,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;AAClC,MAAM,MAAM,GAAG,CAAC,UAAkB,EAAE,IAAgB,EAAmB,EAAE;IACrE,OAAO,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,iBAAiB,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;AAC/E,CAAC,CAAC;AAEF,qBAAqB;AACrB,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,EAAE,IAAI,EAAE,GAAG,EAAa,EAAE,UAAkB;IACtE,MAAM,KAAK,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;IACtC,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAC5C,MAAM,MAAM,GAAG,cAAc,CAAC,aAAa,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC,CAAC;IAC1F,IAAI,GAAG;QAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC5B,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IAC5F,OAAO;QACH,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC;QAC1B,IAAI,EAAE,YAAY,CAAC,SAAS,CAAC;KAChC,CAAC;AACN,CAAC;AAED,qBAAqB;AACrB,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAiB,EAAE,UAAkB;IACjF,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAC5C,MAAM,QAAQ,GAAG,gBAAgB,CAAC,aAAa,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC,CAAC;IAC9F,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,CAAC,CAAC;IAC/D,IAAI,GAAG;QAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC9B,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACnH,OAAO,EAAE,IAAI,EAAE,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC;AAC7C,CAAC"}

package/dist/encryption/wasm.d.ts

@@ -0,0 +1,5 @@
+import { type EncryptedData, type PlainData } from './common.js';
+/** crypto-js encrypt */
+export declare function encrypt({ data, aad }: PlainData, passphrase: string): EncryptedData;
+/** crypto-js decrypt */
+export declare function decrypt({ data, aad, nonce }: EncryptedData, passphrase: string): PlainData;

package/dist/encryption/wasm.js

@@ -0,0 +1,21 @@
+import { NONCE_SIZE, AES_KEY_SIZE, AES_TAG_SIZE, PBKDF2_ITERATIONS, } from './common.js';
+import * as mod from '#lib-wasm';
+const EMPTY = new Uint8Array(0);
+const encoder = new TextEncoder();
+/** crypto-js encrypt */
+export function encrypt({ data, aad }, passphrase) {
+    const nonce = crypto.getRandomValues(new Uint8Array(NONCE_SIZE));
+    const result = mod.encrypt(encoder.encode(passphrase), data, aad ?? EMPTY, nonce, PBKDF2_ITERATIONS, AES_KEY_SIZE, AES_TAG_SIZE);
+    return {
+        nonce,
+        data: result,
+    };
+}
+/** crypto-js decrypt */
+export function decrypt({ data, aad, nonce }, passphrase) {
+    const decrypted = mod.decrypt(encoder.encode(passphrase), data, aad ?? EMPTY, nonce, PBKDF2_ITERATIONS, AES_KEY_SIZE, AES_TAG_SIZE);
+    return {
+        data: decrypted,
+    };
+}
+//# sourceMappingURL=wasm.js.map

package/dist/encryption/wasm.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wasm.js","sourceRoot":"","sources":["../../src/encryption/wasm.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,UAAU,EACV,YAAY,EACZ,YAAY,EAEZ,iBAAiB,GAEpB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,GAAG,MAAM,WAAW,CAAC;AAEjC,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC;AAChC,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;AAElC,wBAAwB;AACxB,MAAM,UAAU,OAAO,CAAC,EAAE,IAAI,EAAE,GAAG,EAAa,EAAE,UAAkB;IAChE,MAAM,KAAK,GAAG,MAAM,CAAC,eAAe,CAAC,IAAI,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;IACjE,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CACtB,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,EAC1B,IAAI,EACJ,GAAG,IAAI,KAAK,EACZ,KAAK,EACL,iBAAiB,EACjB,YAAY,EACZ,YAAY,CACf,CAAC;IACF,OAAO;QACH,KAAK;QACL,IAAI,EAAE,MAAM;KACf,CAAC;AACN,CAAC;AAED,wBAAwB;AACxB,MAAM,UAAU,OAAO,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAiB,EAAE,UAAkB;IAC3E,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CACzB,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,EAC1B,IAAI,EACJ,GAAG,IAAI,KAAK,EACZ,KAAK,EACL,iBAAiB,EACjB,YAAY,EACZ,YAAY,CACf,CAAC;IACF,OAAO;QACH,IAAI,EAAE,SAAS;KAClB,CAAC;AACN,CAAC"}

package/dist/encryption/web.d.ts

@@ -1,5 +1,5 @@
-import { type EncryptionResult } from './common.js';
+import { type EncryptedData, type PlainData } from './common.js';
 /** webcrypto encrypt */
-export declare function encrypt(data: Uint8Array, passphrase: string): Promise<EncryptionResult>;
+export declare function encrypt({ data, aad }: PlainData, passphrase: string): Promise<EncryptedData>;
 /** webcrypto decrypt */
-export declare function decrypt({ data, salt, iv }: EncryptionResult, passphrase: string): Promise<Uint8Array>;
+export declare function decrypt({ data, nonce, aad }: EncryptedData, passphrase: string): Promise<PlainData>;

package/dist/encryption/web.js

@@ -1,4 +1,4 @@
-import { AES_IV_SIZE, AES_KEY_SIZE, PBKDF2_SALT_SIZE, PBKDF2_ITERATIONS } from './common.js';
+import { NONCE_SIZE, AES_TAG_SIZE, AES_KEY_SIZE, PBKDF2_ITERATIONS, } from './common.js';
 const encoder = new TextEncoder();
 /** Create aes params */
 async function aesKdfWeb(passphrase, salt) {
@@ -9,33 +9,35 @@ async function aesKdfWeb(passphrase, salt) {
         iterations: PBKDF2_ITERATIONS,
         hash: 'SHA-256',
     };
-    return await crypto.subtle.deriveKey(pbkdf2Params, pass, { name: 'AES-CBC', length: AES_KEY_SIZE * 8 }, false, [
+    return await crypto.subtle.deriveKey(pbkdf2Params, pass, { name: 'AES-GCM', length: AES_KEY_SIZE * 8 }, false, [
         'encrypt',
         'decrypt',
     ]);
 }
 /** webcrypto encrypt */
-export async function encrypt(data, passphrase) {
-    const salt = crypto.getRandomValues(new Uint8Array(PBKDF2_SALT_SIZE));
-    const key = await aesKdfWeb(passphrase, salt);
-    const iv = crypto.getRandomValues(new Uint8Array(AES_IV_SIZE));
+export async function encrypt({ data, aad }, passphrase) {
+    const nonce = crypto.getRandomValues(new Uint8Array(NONCE_SIZE));
+    const key = await aesKdfWeb(passphrase, nonce);
     const encrypted = await crypto.subtle.encrypt({
-        name: 'AES-CBC',
-        iv,
+        name: 'AES-GCM',
+        iv: nonce,
+        tagLength: AES_TAG_SIZE * 8,
+        additionalData: aad,
     }, key, data);
     return {
-        salt: salt,
-        iv: iv,
+        nonce,
         data: new Uint8Array(encrypted),
     };
 }
 /** webcrypto decrypt */
-export async function decrypt({ data, salt, iv }, passphrase) {
-    const key = await aesKdfWeb(passphrase, salt);
+export async function decrypt({ data, nonce, aad }, passphrase) {
+    const key = await aesKdfWeb(passphrase, nonce);
     const decrypted = await crypto.subtle.decrypt({
-        name: 'AES-CBC',
-        iv,
+        name: 'AES-GCM',
+        iv: nonce,
+        tagLength: AES_TAG_SIZE * 8,
+        additionalData: aad,
     }, key, data);
-    return new Uint8Array(decrypted);
+    return { data: new Uint8Array(decrypted) };
 }
 //# sourceMappingURL=web.js.map

package/dist/encryption/web.js.map

@@ -1 +1 @@
-{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/encryption/web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,gBAAgB,EAAyB,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEpH,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;AAElC,wBAAwB;AACxB,KAAK,UAAU,SAAS,CAAC,UAAkB,EAAE,IAAgB;IACzD,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAC9G,MAAM,YAAY,GAAiB;QAC/B,IAAI,EAAE,QAAQ;QACd,IAAI;QACJ,UAAU,EAAE,iBAAiB;QAC7B,IAAI,EAAE,SAAS;KAClB,CAAC;IACF,OAAO,MAAM,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,GAAG,CAAC,EAAE,EAAE,KAAK,EAAE;QAC3G,SAAS;QACT,SAAS;KACZ,CAAC,CAAC;AACP,CAAC;AAED,wBAAwB;AACxB,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAAgB,EAAE,UAAkB;IAC9D,MAAM,IAAI,GAAG,MAAM,CAAC,eAAe,CAAC,IAAI,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;IACtE,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC9C,MAAM,EAAE,GAAG,MAAM,CAAC,eAAe,CAAC,IAAI,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC;IAC/D,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,OAAO,CACzC;QACI,IAAI,EAAE,SAAS;QACf,EAAE;KACL,EACD,GAAG,EACH,IAAI,CACP,CAAC;IACF,OAAO;QACH,IAAI,EAAE,IAAI;QACV,EAAE,EAAE,EAAE;QACN,IAAI,EAAE,IAAI,UAAU,CAAC,SAAS,CAAC;KAClC,CAAC;AACN,CAAC;AAED,wBAAwB;AACxB,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAoB,EAAE,UAAkB;IAClF,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC9C,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,OAAO,CACzC;QACI,IAAI,EAAE,SAAS;QACf,EAAE;KACL,EACD,GAAG,EACH,IAAI,CACP,CAAC;IACF,OAAO,IAAI,UAAU,CAAC,SAAS,CAAC,CAAC;AACrC,CAAC"}
+{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/encryption/web.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,UAAU,EACV,YAAY,EACZ,YAAY,EAGZ,iBAAiB,GACpB,MAAM,aAAa,CAAC;AAErB,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;AAElC,wBAAwB;AACxB,KAAK,UAAU,SAAS,CAAC,UAAkB,EAAE,IAAgB;IACzD,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAC9G,MAAM,YAAY,GAAiB;QAC/B,IAAI,EAAE,QAAQ;QACd,IAAI;QACJ,UAAU,EAAE,iBAAiB;QAC7B,IAAI,EAAE,SAAS;KAClB,CAAC;IACF,OAAO,MAAM,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,GAAG,CAAC,EAAE,EAAE,KAAK,EAAE;QAC3G,SAAS;QACT,SAAS;KACZ,CAAC,CAAC;AACP,CAAC;AAED,wBAAwB;AACxB,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,EAAE,IAAI,EAAE,GAAG,EAAa,EAAE,UAAkB;IACtE,MAAM,KAAK,GAAG,MAAM,CAAC,eAAe,CAAC,IAAI,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;IACjE,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,OAAO,CACzC;QACI,IAAI,EAAE,SAAS;QACf,EAAE,EAAE,KAAK;QACT,SAAS,EAAE,YAAY,GAAG,CAAC;QAC3B,cAAc,EAAE,GAAG;KACtB,EACD,GAAG,EACH,IAAI,CACP,CAAC;IACF,OAAO;QACH,KAAK;QACL,IAAI,EAAE,IAAI,UAAU,CAAC,SAAS,CAAC;KAClC,CAAC;AACN,CAAC;AAED,wBAAwB;AACxB,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAiB,EAAE,UAAkB;IACjF,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,OAAO,CACzC;QACI,IAAI,EAAE,SAAS;QACf,EAAE,EAAE,KAAK;QACT,SAAS,EAAE,YAAY,GAAG,CAAC;QAC3B,cAAc,EAAE,GAAG;KACtB,EACD,GAAG,EACH,IAAI,CACP,CAAC;IACF,OAAO,EAAE,IAAI,EAAE,IAAI,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;AAC/C,CAAC"}