diff --git a/index.ts b/index.ts index 0fbc1ab..7628cd1 100644 --- a/index.ts +++ b/index.ts @@ -10,4 +10,4 @@ export * as misc from './src/misc' export * as signature from './src/signature' export * as JWT from './src/jwt' -export {SecretBox,SecretWrap,PrivateBox,PrivateWrap,PwdBox,PwdWrap} +export {SecretBox, SecretWrap, PrivateBox, PrivateWrap, PwdBox, PwdWrap} diff --git a/src/kdf.ts b/src/kdf.ts index 2635d41..9e3b52f 100644 --- a/src/kdf.ts +++ b/src/kdf.ts @@ -87,7 +87,7 @@ export async function pbkdf(salt: Uint8Array, password: string): Promise { - log.trace("ecdh") + log.trace('ecdh') const outputUsage: KeyUsage[] = usage === DHusage.box ? ['encrypt', 'decrypt'] : ['wrapKey', 'unwrapKey'] return crypto.subtle.deriveKey( { diff --git a/src/misc.ts b/src/misc.ts index b7bc134..c9d58a5 100644 --- a/src/misc.ts +++ b/src/misc.ts @@ -6,7 +6,7 @@ const log = logger('misc') export enum Usage { sign, - ecdh, + ecdh } export async function pubkey_toString(pubkey: CryptoKey): Promise { @@ -29,8 +29,8 @@ export async function pubkey_fromString(pubkey_str: string, usage: Usage): Promi usage === Usage.ecdh ? [] : ['verify'] ) } catch (e) { - log.warn("Failed to import public key") - log.debug("Error :", e) + log.warn('Failed to import public key') + log.debug('Error :', e) return null } } diff --git a/src/private-box.ts b/src/private-box.ts index 0aaf79b..9695f44 100644 --- a/src/private-box.ts +++ b/src/private-box.ts @@ -17,9 +17,9 @@ export default class PrivateBox { log.trace('Extractable :', extractable) try { return crypto.subtle.generateKey(consts.ECDH, extractable, ['deriveKey']) as Promise - } catch(e) { - log.warn("Failed to generate a key") - log.debug("Error :", e) + } catch (e) { + log.warn('Failed to generate a key') + log.debug('Error :', e) throw e } } @@ -51,7 +51,7 @@ export default class PrivateBox { const pubkey = await pubkey_fromString(parts[0], Usage.ecdh) if (pubkey === null) return null - const box = SecretBox.fromString(parts.slice(1).join(".")) + const box = SecretBox.fromString(parts.slice(1).join('.')) if (box === null) return null return new PrivateBox(pubkey, box) diff --git a/src/private-wrap.ts b/src/private-wrap.ts index 008cc87..40ee2c1 100644 --- a/src/private-wrap.ts +++ b/src/private-wrap.ts @@ -44,7 +44,7 @@ export default class PrivateWrap { const pubkey = await pubkey_fromString(parts[0], Usage.ecdh) if (pubkey === null) return null - const box = SecretWrap.fromString(parts.slice(1).join(".")) + const box = SecretWrap.fromString(parts.slice(1).join('.')) if (box === null) return null return new PrivateWrap(box, pubkey) diff --git a/src/pwd-box.ts b/src/pwd-box.ts index b760052..569c3b4 100644 --- a/src/pwd-box.ts +++ b/src/pwd-box.ts @@ -43,7 +43,7 @@ export default class PwdBox { const salt = b642a(parts[0]) if (salt === null) return null - const box = SecretBox.fromString(parts.slice(1).join(".")) + const box = SecretBox.fromString(parts.slice(1).join('.')) if (box === null) return null return new PwdBox(box, salt) diff --git a/src/pwd-wrap.ts b/src/pwd-wrap.ts index 99bdc0d..e059c1f 100644 --- a/src/pwd-wrap.ts +++ b/src/pwd-wrap.ts @@ -44,7 +44,7 @@ export default class PwdWrap { const salt = b642a(parts[0]) if (salt === null) return null - const box = SecretWrap.fromString(parts.slice(1).join(".")) + const box = SecretWrap.fromString(parts.slice(1).join('.')) if (box === null) return null return new PwdWrap(box, salt) diff --git a/src/secret-box.ts b/src/secret-box.ts index 8d897dd..8d70af2 100644 --- a/src/secret-box.ts +++ b/src/secret-box.ts @@ -47,9 +47,9 @@ export default class SecretBox { this.cipher ) return new Uint8Array(buffer) - } catch(e) { - log.warn("Failed to decrypt") - log.debug("Error :", e) + } catch (e) { + log.warn('Failed to decrypt') + log.debug('Error :', e) return null } } @@ -67,7 +67,7 @@ export default class SecretBox { const parts = data.split('.') if (parts.length < 2) { - log.warn("Invalid parts count") + log.warn('Invalid parts count') return null } diff --git a/src/secret-wrap.ts b/src/secret-wrap.ts index aab567b..9656675 100644 --- a/src/secret-wrap.ts +++ b/src/secret-wrap.ts @@ -46,10 +46,18 @@ export default class SecretWrap { public async decrypt(key: CryptoKey): Promise { log.trace('decrypt') try { - return await crypto.subtle.unwrapKey(this.type, this.cipher, key, {name: consts.ENCRYPTION, iv: this.iv}, this.algorithm, true, this.usages) - } catch(e) { - log.warn("Failed to unwrap") - log.debug("Error :", e) + return await crypto.subtle.unwrapKey( + this.type, + this.cipher, + key, + {name: consts.ENCRYPTION, iv: this.iv}, + this.algorithm, + true, + this.usages + ) + } catch (e) { + log.warn('Failed to unwrap') + log.debug('Error :', e) return null } } @@ -62,7 +70,7 @@ export default class SecretWrap { algorithm: this.algorithm, usages: this.usages, type: this.type, - iv, + iv }) } public static fromString(data: string): SecretWrap | null { diff --git a/test/private-box.test.ts b/test/private-box.test.ts index d224277..0b02a35 100644 --- a/test/private-box.test.ts +++ b/test/private-box.test.ts @@ -2,14 +2,14 @@ import {beforeAll, expect, test} from 'bun:test' import {PrivateBox} from '..' import {pubkey_toString} from '../src/misc' -let k1!: CryptoKeyPair; -let k2!: CryptoKeyPair; -let message!: Uint8Array; +let k1!: CryptoKeyPair +let k2!: CryptoKeyPair +let message!: Uint8Array beforeAll(async () => { k1 = await PrivateBox.gen(false) k2 = await PrivateBox.gen(true) - message = new TextEncoder().encode("Salut ! ça va ?") + message = new TextEncoder().encode('Salut ! ça va ?') }) test('base case', async () => { diff --git a/test/private-wrap.test.ts b/test/private-wrap.test.ts index 3149f45..0c363af 100644 --- a/test/private-wrap.test.ts +++ b/test/private-wrap.test.ts @@ -2,9 +2,9 @@ import {beforeAll, expect, test} from 'bun:test' import {PrivateWrap, SecretBox} from '..' import {pubkey_toString} from '../src/misc' -let k1!: CryptoKeyPair; -let k2!: CryptoKeyPair; -let message!: CryptoKey; +let k1!: CryptoKeyPair +let k2!: CryptoKeyPair +let message!: CryptoKey beforeAll(async () => { k1 = await PrivateWrap.gen(false) diff --git a/test/pwd-box.test.ts b/test/pwd-box.test.ts index 67d2e64..5a51c9a 100644 --- a/test/pwd-box.test.ts +++ b/test/pwd-box.test.ts @@ -1,14 +1,14 @@ import {beforeAll, expect, test} from 'bun:test' import {PwdBox} from '..' -let k1!: string; -let k2!: string; -let message!: Uint8Array; +let k1!: string +let k2!: string +let message!: Uint8Array beforeAll(async () => { - k1 = "abc" - k2 = "def" - message = new TextEncoder().encode("Salut ! ça va ?") + k1 = 'abc' + k2 = 'def' + message = new TextEncoder().encode('Salut ! ça va ?') }) test('base case', async () => { diff --git a/test/pwd-wrap.test.ts b/test/pwd-wrap.test.ts index d065262..cb851a8 100644 --- a/test/pwd-wrap.test.ts +++ b/test/pwd-wrap.test.ts @@ -1,13 +1,13 @@ import {beforeAll, expect, test} from 'bun:test' import {PwdWrap, SecretBox} from '..' -let k1!: string; -let k2!: string; -let message!: CryptoKey; +let k1!: string +let k2!: string +let message!: CryptoKey beforeAll(async () => { - k1 = "abc" - k2 = "def" + k1 = 'abc' + k2 = 'def' message = await SecretBox.gen(true) }) diff --git a/test/secret-box.test.ts b/test/secret-box.test.ts index 8af0864..695b452 100644 --- a/test/secret-box.test.ts +++ b/test/secret-box.test.ts @@ -1,14 +1,14 @@ import {beforeAll, expect, test} from 'bun:test' import {SecretBox} from '..' -let k1!: CryptoKey; -let k2!: CryptoKey; -let message!: Uint8Array; +let k1!: CryptoKey +let k2!: CryptoKey +let message!: Uint8Array beforeAll(async () => { k1 = await SecretBox.gen(false) k2 = await SecretBox.gen(true) - message = new TextEncoder().encode("Salut ! ça va ?") + message = new TextEncoder().encode('Salut ! ça va ?') }) test('base case', async () => { diff --git a/test/secret-wrap.test.ts b/test/secret-wrap.test.ts index 7c85e75..1ce8283 100644 --- a/test/secret-wrap.test.ts +++ b/test/secret-wrap.test.ts @@ -1,9 +1,9 @@ import {beforeAll, expect, test} from 'bun:test' import {SecretWrap} from '..' -let k1!: CryptoKey; -let k2!: CryptoKey; -let message!: CryptoKey; +let k1!: CryptoKey +let k2!: CryptoKey +let message!: CryptoKey beforeAll(async () => { k1 = await SecretWrap.gen(false) diff --git a/test/wrap.test.ts b/test/wrap.test.ts index 7183f4c..9142c52 100644 --- a/test/wrap.test.ts +++ b/test/wrap.test.ts @@ -1,7 +1,7 @@ import {PrivateBox, PrivateWrap, SecretBox, SecretWrap, signature} from '..' import {beforeAll, expect, test} from 'bun:test' -let wrap_key!: CryptoKey; +let wrap_key!: CryptoKey beforeAll(async () => { wrap_key = await SecretWrap.gen(true)