@cloudpss/crypto 0.5.24 → 0.5.25

package/dist/encryption/js/gcm.js

@@ -0,0 +1,226 @@
+import { AES } from './aes.js';
+// const console = { log() {} };
+const EMPTY = new Uint8Array(0);
+/** GCM (Galois/Counter Mode) */
+export class GCM {
+    cipher;
+    iv;
+    tagLength;
+    aad;
+    constructor(cipher, iv, tagLength = 128, aad = EMPTY) {
+        this.cipher = cipher;
+        this.iv = iv;
+        this.tagLength = tagLength;
+        this.aad = aad;
+        this.H = new Uint32Array(4);
+        this.cipher.encrypt(new Uint32Array(4), 0, this.H, 0);
+    }
+    /** Convert a Uint8Array to a Uint32Array */
+    toUint32Array(data) {
+        const out = new Uint32Array(Math.ceil(data.byteLength / 4));
+        for (let i = 0; i < out.length; i++) {
+            out[i] = (data[i * 4] << 24) | (data[i * 4 + 1] << 16) | (data[i * 4 + 2] << 8) | data[i * 4 + 3];
+        }
+        return out;
+    }
+    /** Convert a Uint32Array to a Uint8Array */
+    toUint8Array(data, byteLength) {
+        const out = new Uint8Array(byteLength);
+        for (let i = 0; i < byteLength; i++) {
+            out[i] = (data[Math.trunc(i / 4)] >>> (24 - (i % 4) * 8)) & 0xff;
+        }
+        return out;
+    }
+    /** Set out of range bytes to 0 */
+    clamp(data, byteLength) {
+        const mask = 0xffff_ffff << (32 - (byteLength % 4) * 8);
+        data[Math.trunc(byteLength / 4)] &= mask;
+    }
+    H;
+    /** Compute the galois multiplication of X and Y */
+    galoisMultiply(x_r, y) {
+        let Zi0 = 0, Zi1 = 0, Zi2 = 0, Zi3 = 0;
+        let Vi0 = y[0], Vi1 = y[1], Vi2 = y[2], Vi3 = y[3];
+        // Block size is 128 bits, run 128 times to get Z_128
+        for (let i = 0; i < 128; i++) {
+            const xi = (x_r[i >> 5] & (1 << (31 - (i % 32)))) !== 0;
+            if (xi) {
+                // Z_i+1 = Z_i ^ V_i
+                Zi0 ^= Vi0;
+                Zi1 ^= Vi1;
+                Zi2 ^= Vi2;
+                Zi3 ^= Vi3;
+            }
+            // Store the value of LSB(V_i)
+            const lsb_Vi = (Vi3 & 1) !== 0;
+            // V_i+1 = V_i >> 1
+            Vi3 = (Vi3 >>> 1) | ((Vi2 & 1) << 31);
+            Vi2 = (Vi2 >>> 1) | ((Vi1 & 1) << 31);
+            Vi1 = (Vi1 >>> 1) | ((Vi0 & 1) << 31);
+            Vi0 = Vi0 >>> 1;
+            // If LSB(V_i) is 1, V_i+1 = (V_i >> 1) ^ R
+            if (lsb_Vi) {
+                Vi0 = Vi0 ^ (0xe1 << 24);
+            }
+        }
+        x_r[0] = Zi0;
+        x_r[1] = Zi1;
+        x_r[2] = Zi2;
+        x_r[3] = Zi3;
+    }
+    /** Ghash */
+    ghash(Y, data) {
+        const l = data.length;
+        for (let i = 0; i < l; i += 4) {
+            Y[0] ^= 0xffff_ffff & data[i];
+            Y[1] ^= 0xffff_ffff & data[i + 1];
+            Y[2] ^= 0xffff_ffff & data[i + 2];
+            Y[3] ^= 0xffff_ffff & data[i + 3];
+            this.galoisMultiply(Y, this.H);
+        }
+    }
+    /** GCM CTR mode. */
+    ctr(encrypt, data, length) {
+        // console.log('data inpm', toHex(data));
+        // Calculate data lengths
+        const l = length / 4;
+        const bl = l * 32;
+        const abl = this.aad.byteLength * 8;
+        const ivbl = this.iv.byteLength * 8;
+        // Calculate the parameters
+        const J0 = new Uint32Array(4);
+        if (ivbl === 96) {
+            new Uint8Array(J0.buffer, J0.byteOffset).set(this.iv);
+            J0[3] = 1;
+        }
+        else {
+            this.ghash(J0, this.toUint32Array(this.iv));
+            this.ghash(J0, new Uint32Array([0, 0, Math.trunc(ivbl / 0x1_0000_0000), ivbl & 0xffff_ffff]));
+        }
+        const S0 = new Uint32Array(4);
+        this.ghash(S0, this.toUint32Array(this.aad));
+        // Initialize ctr and tag
+        const tag = S0.slice(0);
+        // If decrypting, calculate hash
+        if (!encrypt) {
+            this.ghash(tag, data);
+        }
+        // Encrypt all the data
+        const ctr = J0.slice(0);
+        const enc = new Uint32Array(4);
+        for (let i = 0; i < l; i += 4) {
+            ctr[3]++;
+            this.cipher.encrypt(ctr, 0, enc, 0);
+            data[i] ^= enc[0];
+            data[i + 1] ^= enc[1];
+            data[i + 2] ^= enc[2];
+            data[i + 3] ^= enc[3];
+        }
+        this.clamp(data, length);
+        // console.log('data inpm', toHex(data));
+        // console.log('H impl', toHex(this.H));
+        // console.log('tag impl', toHex(tag));
+        // If encrypting, calculate hash
+        if (encrypt) {
+            this.ghash(tag, data);
+        }
+        // console.log('tag impl', toHex(tag));
+        // Calculate last block from bit lengths, ugly because bitwise operations are 32-bit
+        // Calculate the final tag block
+        this.ghash(tag, new Uint32Array([
+            Math.trunc(abl / 0x1_0000_0000),
+            abl & 0xffff_ffff,
+            Math.trunc(bl / 0x1_0000_0000),
+            bl & 0xffff_ffff,
+        ]));
+        this.cipher.encrypt(J0, 0, enc, 0);
+        tag[0] ^= enc[0];
+        tag[1] ^= enc[1];
+        tag[2] ^= enc[2];
+        tag[3] ^= enc[3];
+        // console.log('tag impl', toHex(tag));
+        return {
+            tag: new Uint8Array(tag.buffer, tag.byteOffset, this.tagLength / 8),
+            data,
+        };
+    }
+    /** 加密 */
+    encrypt(data) {
+        const length = data.byteLength;
+        const data32 = this.toUint32Array(data);
+        const { data: out, tag } = this.ctr(true, data32, length);
+        const result = new Uint8Array(length + tag.byteLength);
+        result.set(this.toUint8Array(out, length), 0);
+        result.set(tag, length);
+        return result;
+    }
+    /** 解密 */
+    decrypt(data) {
+        let tag, data32, length;
+        if (this.tagLength / 8 > data.byteLength) {
+            throw new Error('GCM: invalid data length');
+        }
+        else if (this.tagLength / 8 === data.byteLength) {
+            length = 0;
+            tag = data;
+            data32 = new Uint32Array(0);
+        }
+        else {
+            length = data.byteLength - this.tagLength / 8;
+            tag = data.subarray(length);
+            data32 = this.toUint32Array(data.subarray(0, length));
+        }
+        const { data: out, tag: tag2 } = this.ctr(false, data32, length);
+        if (tag2.some((v, i) => v !== tag[i])) {
+            throw new Error('GCM: tag does not match');
+        }
+        return this.toUint8Array(out, length);
+    }
+}
+// import sjcl from 'sjcl';
+// global.sjcl = sjcl;
+// // @ts-expect-error sjcl is not a module
+// await import('sjcl/core/aes.js');
+// // @ts-expect-error sjcl is not a module
+// await import('sjcl/core/gcm.js');
+// // @ts-expect-error sjcl is not a module
+// await import('sjcl/core/bitArray.js');
+// // @ts-expect-error sjcl is not a module
+// await import('sjcl/core/pbkdf2.js');
+// // @ts-expect-error sjcl is not a module
+// await import('sjcl/core/hmac.js');
+// // @ts-expect-error sjcl is not a module
+// await import('sjcl/core/sha256.js');
+// // @ts-expect-error sjcl is not a module
+// await import('sjcl/core/codecBytes.js');
+// function toHex(arr: number[] | Uint32Array | Int32Array | Uint8Array): string[] {
+//     if (arr instanceof Uint8Array) {
+//         const result = [];
+//         for (let i = 0; i < arr.length; i += 4) {
+//             const a = arr[i].toString(16).padStart(2, '0');
+//             const b = arr[i + 1]?.toString(16).padStart(2, '0') ?? '';
+//             const c = arr[i + 2]?.toString(16).padStart(2, '0') ?? '';
+//             const d = arr[i + 3]?.toString(16).padStart(2, '0') ?? '';
+//             result.push(a + b + c + d);
+//         }
+//         return result;
+//     }
+//     return [...arr].map((x) => {
+//         if (x < 0) x = 0xffffffff + x + 1;
+//         return x.toString(16).padStart(8, '0');
+//     });
+// }
+// // @ts-expect-error sjcl is not a module
+// global.toHex = toHex;
+// const data = new Uint8Array([1, 2, 3, 4, 5, 6, 7]);
+// const key = [1, 2, 3, 4];
+// const iv = [9, 8, 7];
+// const aes = new AES(new Uint32Array(key));
+// const gcm = new GCM(aes, new Uint8Array(new Uint32Array(iv).buffer));
+// const e1 = gcm.encrypt(data);
+// const e2 = sjcl.mode.gcm.encrypt(new sjcl.cipher.aes(key), sjcl.codec.bytes.toBits([...data]), iv);
+// console.log({ d: toHex(e1), l: e1.byteLength }, { d: toHex(e2), l: sjcl.bitArray.bitLength(e2) / 8 });
+// const d1 = gcm.decrypt(e1);
+// const d2 = sjcl.mode.gcm.decrypt(new sjcl.cipher.aes(key), e2, iv);
+// console.log({ d: toHex(d1), l: d1.byteLength }, { d: toHex(d2), l: sjcl.bitArray.bitLength(d2) / 8 });
+//# sourceMappingURL=gcm.js.map

package/dist/encryption/js/gcm.js.map

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

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')): 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/pure-js.d.ts

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

package/dist/encryption/pure-js.js

@@ -1,54 +1,82 @@
-import { pbkdf2, createSHA256 } from 'hash-wasm';
-import AES from 'crypto-js/aes.js';
-import WordArray from 'crypto-js/lib-typedarrays.js';
-import { AES_IV_SIZE, AES_KEY_SIZE, PBKDF2_SALT_SIZE, PBKDF2_ITERATIONS } from './common.js';
+import sjcl from 'sjcl';
+import { NONCE_SIZE, AES_KEY_SIZE, AES_TAG_SIZE, PBKDF2_ITERATIONS, } from './common.js';
+// Load unminified version for debugging
+// globalThis.sjcl = sjcl;
+// // @ts-expect-error sjcl is not a module
+// await import('sjcl/core/aes.js');
+// // @ts-expect-error sjcl is not a module
+// await import('sjcl/core/gcm.js');
+// // @ts-expect-error sjcl is not a module
+// await import('sjcl/core/bitArray.js');
+// // @ts-expect-error sjcl is not a module
+// await import('sjcl/core/pbkdf2.js');
+// // @ts-expect-error sjcl is not a module
+// await import('sjcl/core/hmac.js');
+// // @ts-expect-error sjcl is not a module
+// await import('sjcl/core/sha256.js');
 /** Convert word array to buffer data */
-function wordArrayToBuffer(wordArray) {
-    const { sigBytes, words } = wordArray;
-    if (sigBytes < 0 || words.length * 4 < sigBytes)
-        throw new Error('Invalid word array');
-    const result = new Uint8Array(sigBytes);
-    for (let i = 0; i < sigBytes; i++) {
-        result[i] = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
-    }
-    return result;
+function wordArrayToBuffer(bitArray) {
+    const len = sjcl.bitArray.bitLength(bitArray) / 8;
+    const out = new Uint8Array(len);
+    for (let i = 0; i < len; i += 4) {
+        const tmp = bitArray[i / 4];
+        out[i] = (tmp >>> 24) & 0xff;
+        out[i + 1] = (tmp >>> 16) & 0xff;
+        out[i + 2] = (tmp >>> 8) & 0xff;
+        out[i + 3] = tmp & 0xff;
+    }
+    return out;
 }
 /** Convert buffer data to word array */
 function bufferToWordArray(buffer) {
-    return WordArray.create(buffer);
+    const out = [];
+    const length = buffer.byteLength;
+    for (let i = 0; i < length; i += 4) {
+        out.push((buffer[i] << 24) | (buffer[i + 1] << 16) | (buffer[i + 2] << 8) | buffer[i + 3]);
+    }
+    if (length & 3) {
+        out[out.length - 1] = sjcl.bitArray.partial(8 * (length & 3), out[out.length - 1], 1);
+    }
+    return out;
 }
 /** Create aes params */
-async function aesKdfJs(passphrase, salt) {
-    const result = await pbkdf2({
-        password: passphrase,
-        salt: salt,
-        iterations: PBKDF2_ITERATIONS,
-        hashLength: AES_KEY_SIZE,
-        hashFunction: createSHA256(),
-        outputType: 'binary',
-    });
-    return WordArray.create(result);
+function aesKdfJs(passphrase, salt) {
+    return sjcl.misc.pbkdf2(passphrase, salt, PBKDF2_ITERATIONS, AES_KEY_SIZE * 8, sjcl.misc.hmac);
+}
+/** wrap non-error thrown */
+function wrapError(error) {
+    if (error instanceof Error) {
+        return error;
+    }
+    return new Error(String(error), { cause: error });
 }
 /** crypto-js encrypt */
-export async function encrypt(data, passphrase) {
-    const salt = wordArrayToBuffer(WordArray.random(PBKDF2_SALT_SIZE));
-    const key = await aesKdfJs(passphrase, salt);
-    const iv = WordArray.random(AES_IV_SIZE);
-    const encrypted = AES.encrypt(bufferToWordArray(data), key, { iv });
-    return {
-        salt: salt,
-        iv: wordArrayToBuffer(iv),
-        data: wordArrayToBuffer(encrypted.ciphertext),
-    };
+export async function encrypt({ data, aad }, passphrase) {
+    try {
+        const nonce = sjcl.random.randomWords(NONCE_SIZE / 4);
+        const key = aesKdfJs(passphrase, nonce);
+        const encrypted = sjcl.mode.gcm.encrypt(new sjcl.cipher.aes(key), bufferToWordArray(data), nonce, aad ? bufferToWordArray(aad) : undefined, AES_TAG_SIZE * 8);
+        return await Promise.resolve({
+            nonce: wordArrayToBuffer(nonce),
+            data: wordArrayToBuffer(encrypted),
+        });
+    }
+    catch (ex) {
+        throw wrapError(ex);
+    }
 }
 /** crypto-js decrypt */
-export async function decrypt({ data, iv, salt }, passphrase) {
-    const key = await aesKdfJs(passphrase, salt);
-    const decrypted = AES.decrypt({
-        ciphertext: bufferToWordArray(data),
-    }, key, {
-        iv: bufferToWordArray(iv),
-    });
-    return wordArrayToBuffer(decrypted);
+export async function decrypt({ data, aad, nonce }, passphrase) {
+    try {
+        const n = bufferToWordArray(nonce);
+        const key = aesKdfJs(passphrase, n);
+        const decrypted = sjcl.mode.gcm.decrypt(new sjcl.cipher.aes(key), bufferToWordArray(data), n, aad ? bufferToWordArray(aad) : undefined, AES_TAG_SIZE * 8);
+        return await Promise.resolve({
+            data: wordArrayToBuffer(decrypted),
+        });
+    }
+    catch (ex) {
+        throw wrapError(ex);
+    }
 }
 //# sourceMappingURL=pure-js.js.map

package/dist/encryption/pure-js.js.map

@@ -1 +1 @@
-{"version":3,"file":"pure-js.js","sourceRoot":"","sources":["../../src/encryption/pure-js.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,GAAG,MAAM,kBAAkB,CAAC;AACnC,OAAO,SAAS,MAAM,8BAA8B,CAAC;AAErD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,gBAAgB,EAAyB,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEpH,wCAAwC;AACxC,SAAS,iBAAiB,CAAC,SAAoB;IAC3C,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC;IACtC,IAAI,QAAQ,GAAG,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,GAAG,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACvF,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,QAAQ,CAAC,CAAC;IACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC;QAChC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAC/D,CAAC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,wCAAwC;AACxC,SAAS,iBAAiB,CAAC,MAAkB;IACzC,OAAO,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC;AAED,wBAAwB;AACxB,KAAK,UAAU,QAAQ,CAAC,UAAkB,EAAE,IAAgB;IACxD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC;QACxB,QAAQ,EAAE,UAAU;QACpB,IAAI,EAAE,IAAI;QACV,UAAU,EAAE,iBAAiB;QAC7B,UAAU,EAAE,YAAY;QACxB,YAAY,EAAE,YAAY,EAAE;QAC5B,UAAU,EAAE,QAAQ;KACvB,CAAC,CAAC;IACH,OAAO,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC;AAED,wBAAwB;AACxB,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAAgB,EAAE,UAAkB;IAC9D,MAAM,IAAI,GAAG,iBAAiB,CAAC,SAAS,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC;IACnE,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC7C,MAAM,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACzC,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IACpE,OAAO;QACH,IAAI,EAAE,IAAI;QACV,EAAE,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACzB,IAAI,EAAE,iBAAiB,CAAC,SAAS,CAAC,UAAU,CAAC;KAChD,CAAC;AACN,CAAC;AAED,wBAAwB;AACxB,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAoB,EAAE,UAAkB;IAClF,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC7C,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CACzB;QACI,UAAU,EAAE,iBAAiB,CAAC,IAAI,CAAC;KACT,EAC9B,GAAG,EACH;QACI,EAAE,EAAE,iBAAiB,CAAC,EAAE,CAAC;KAC5B,CACJ,CAAC;IACF,OAAO,iBAAiB,CAAC,SAAS,CAAC,CAAC;AACxC,CAAC"}
+{"version":3,"file":"pure-js.js","sourceRoot":"","sources":["../../src/encryption/pure-js.ts"],"names":[],"mappings":"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"}

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