typescript/libcrypto
1
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

fmt

Browse Source
This commit is contained in:
Pascal Perrenoud
2024-09-09 16:11:18 +02:00
parent a919eabbba
commit 5fa068776c
16 changed files with 55 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.ts
+1 -1
View File
@@ -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}
src/kdf.ts
+1 -1
View File
@@ -87,7 +87,7 @@ export async function pbkdf(salt: Uint8Array, password: string): Promise<Uint8Ar
return new Uint8Array(buffer)
}
export function ecdh(privkey: CryptoKey, pubkey: CryptoKey, usage: DHusage): Promise<CryptoKey> {
log.trace("ecdh")
log.trace('ecdh')
const outputUsage: KeyUsage[] = usage === DHusage.box ? ['encrypt', 'decrypt'] : ['wrapKey', 'unwrapKey']
return crypto.subtle.deriveKey(
{
src/misc.ts
+3 -3
View File
@@ -6,7 +6,7 @@ const log = logger('misc')
export enum Usage {
sign,
ecdh,
ecdh
}
export async function pubkey_toString(pubkey: CryptoKey): Promise<string> {
@@ -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
}
}
src/private-box.ts
+4 -4
View File
@@ -17,9 +17,9 @@ export default class PrivateBox {
log.trace('Extractable :', extractable)
try {
return crypto.subtle.generateKey(consts.ECDH, extractable, ['deriveKey']) as Promise<CryptoKeyPair>
} 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)
src/private-wrap.ts
+1 -1
View File
@@ -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)
src/pwd-box.ts
+1 -1
View File
@@ -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)
src/pwd-wrap.ts
+1 -1
View File
@@ -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)
src/secret-box.ts
+4 -4
View File
@@ -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
}
src/secret-wrap.ts
+13 -5
View File
@@ -46,10 +46,18 @@ export default class SecretWrap {
public async decrypt(key: CryptoKey): Promise<CryptoKey | null> {
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 {
test/private-box.test.ts
+4 -4
View File
@@ -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 () => {
test/private-wrap.test.ts
+3 -3
View File
@@ -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)
test/pwd-box.test.ts
+6 -6
View File
@@ -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 () => {
test/pwd-wrap.test.ts
+5 -5
View File
@@ -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)
})
test/secret-box.test.ts
+4 -4
View File
@@ -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 () => {
test/secret-wrap.test.ts
+3 -3
View File
@@ -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)
test/wrap.test.ts
+1 -1
View File
@@ -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)