Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-04-02 05:23:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

no subtlecrypto encryption

Browse Source
This commit is contained in:
Drew Ansbacher
2021-09-14 17:01:38 -06:00
committed by Aiden McClelland
parent d24f20cc87
commit a59f4ad2be
5 changed files with 282 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup-wizard/src/app/pages/product-key/product-key.page.ts
View File

@@ -1,7 +1,7 @@
import { Component } from '@angular/core'
import { iosTransitionAnimation, LoadingController, NavController } from '@ionic/angular'
import { ApiService } from 'src/app/services/api/api.service'
import { HttpService } from 'src/app/services/api/http.service'
import { AES_CTR, decodeUtf8, encodeUtf8, HttpService } from 'src/app/services/api/http.service'
import { StateService } from 'src/app/services/state.service'
@Component({

51
setup-wizard/src/app/services/api/http.service.ts
View File

@@ -2,6 +2,8 @@ import { Injectable } from '@angular/core'
import { HttpClient, HttpErrorResponse, HttpHeaders, HttpParams } from '@angular/common/http'
import { Observable, from, interval, race, Subject } from 'rxjs'
import { map, take } from 'rxjs/operators'
import * as aesjs from 'aes-js'
import * as pbkdf2 from 'pbkdf2'
@Injectable({
providedIn: 'root',
@@ -175,55 +177,24 @@ type AES_CTR = {
export const AES_CTR: AES_CTR = {
encryptPbkdf2: async (secretKey: string, messageBuffer: Uint8Array) => {
const { key, salt } = await pbkdf2(secretKey, { name: 'AES-CTR', length: 256 })
const salt = window.crypto.getRandomValues(new Uint8Array(16))
const counter = window.crypto.getRandomValues(new Uint8Array(16))
const algorithm = { name: 'AES-CTR', counter, length: 64 }
return window.crypto.subtle.encrypt(algorithm, key, messageBuffer)
.then(encrypted => new Uint8Array(encrypted))
.then(cipher => new Uint8Array([...counter,...salt,...cipher]))
const key = pbkdf2.pbkdf2Sync(secretKey, salt, 1, 256 / 8, 'sha512');
var aesCtr = new aesjs.ModeOfOperation.ctr(key, new aesjs.Counter(counter));
var encryptedBytes = aesCtr.encrypt(messageBuffer);
return new Uint8Array([...counter,...salt,...encryptedBytes])
},
decryptPbkdf2: async (secretKey: string, arr: Uint8Array) => {
const counter = arr.slice(0, 16)
const salt = arr.slice(16, 32)
const cipher = arr.slice(32)
const { key } = await pbkdf2(secretKey, { name: 'AES-CTR', length: 256 }, salt)
const algorithm = { name: 'AES-CTR', counter, length: 64 };
(window as any).stuff = { algorithm, key, cipher }
return window.crypto.subtle.decrypt(algorithm, key, cipher)
.then(decrypted => new Uint8Array(decrypted))
const key = pbkdf2.pbkdf2Sync(secretKey, salt, 1, 256 / 8, 'sha512');
var aesCtr = new aesjs.ModeOfOperation.ctr(key, new aesjs.Counter(counter));
return aesCtr.decrypt(cipher);
},
}
async function pbkdf2 (secretKey: string, algorithm: AesKeyAlgorithm | HmacKeyGenParams, salt = window.crypto.getRandomValues(new Uint8Array(16))): Promise<{ salt: Uint8Array, key: CryptoKey, rawKey: Uint8Array }> {
const usages: KeyUsage[] = algorithm.name === 'AES-CTR' ? [ 'encrypt', 'decrypt' ] : [ 'sign' ]
const keyMaterial = await window.crypto.subtle.importKey(
'raw',
encodeUtf8(secretKey),
'PBKDF2',
false,
['deriveBits', 'deriveKey'],
)
const key = await window.crypto.subtle.deriveKey(
{
name: 'PBKDF2',
salt,
iterations: 100000,
hash: 'SHA-256',
},
keyMaterial,
algorithm,
true,
usages,
)
const rawKey = await window.crypto.subtle.exportKey('raw', key).then(r => new Uint8Array(r))
return { salt, key, rawKey }
}
export const encode16 = (buffer: Uint8Array) => buffer.reduce((str, byte) => str + byte.toString(16).padStart(2, '0'), '')
export const decode16 = hexString => new Uint8Array(hexString.match(/.{1,2}/g).map(byte => parseInt(byte, 16)))