cupcakearmy/occulto
1
0
Fork 0
mirror of https://github.com/cupcakearmy/occulto.git synced 2024-12-22 10:46:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
cupcakearmy 2022-10-14 17:34:02 +02:00
parent be4e736ffd
commit 6d58350575
No known key found for this signature in database
GPG Key ID: 3235314B4D31232F
1 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/crypto/aes.ts
View File

@ -11,7 +11,7 @@ const Params = {
}, },
} }
export type IRKeyData = { export type KeyData = {
name: 'PBKDF2' name: 'PBKDF2'
hash: Hashes hash: Hashes
iterations: number iterations: number
@ -19,29 +19,6 @@ export type IRKeyData = {
length: number length: number
} }
// type IRObject = {
// algorithm: string
// iv: TypedArray
// data: TypedArray
// derived?: {
// algorithm: 'PBKDF2'
// hash: 'SHA1'
// iterations: number
// salt: TypedArray
// }
// }
// /**
// * Intermediate representation of encrypted objects
// */
// class IR {
// static delimiter = ':::' // delimiter with a character that is not allowed in base64 or hex
// // static parse(s: string): IRObject {
// // const [algorithm, iv, data, derived] = s.split(IR.delimiter)
// // }
// }
/** /**
* AES operation modes. * AES operation modes.
*/ */
@ -71,7 +48,7 @@ export class AES {
* Derive a key from a password. * Derive a key from a password.
* To be used if the password is not 128, 192 or 256 bits or human made, non generated keys. * To be used if the password is not 128, 192 or 256 bits or human made, non generated keys.
*/ */
static async derive(key: string, options?: IRKeyData): Promise<[TypedArray, IRKeyData]> { static async derive(key: string, options?: KeyData): Promise<[TypedArray, KeyData]> {
options ??= { options ??= {
name: 'PBKDF2', name: 'PBKDF2',
hash: Hashes.SHA_512, hash: Hashes.SHA_512,
@ -151,7 +128,7 @@ export class AES {
const [name, hash, iterations, salt, length] = await this.split(header) const [name, hash, iterations, salt, length] = await this.split(header)
if (!name || !hash || !iterations || !salt || !length) throw this.InvalidCiphertext if (!name || !hash || !iterations || !salt || !length) throw this.InvalidCiphertext
const options: IRKeyData = { const options: KeyData = {
name: Bytes.decode(name) as any, name: Bytes.decode(name) as any,
hash: Bytes.decode(hash) as any, hash: Bytes.decode(hash) as any,
iterations: parseInt(Bytes.decode(iterations)), iterations: parseInt(Bytes.decode(iterations)),